X-Git-Url: https://deadsoftware.ru/gitweb?p=cavedroid.git;a=blobdiff_plain;f=core%2Fsrc%2Fru%2Fdeadsoftware%2Fcavecraft%2Fgame%2FGameRenderer.java;h=648e785e8d07a96c9de6728124be0bcaac3013a8;hp=3ffc0aed78dda0c7914330a13d91c098cffc9037;hb=4617ae53584520a741f45770e17a2a253717f83a;hpb=c217099d21a0703347236f2d83e4d20c266f9be1

diff --git a/core/src/ru/deadsoftware/cavecraft/game/GameRenderer.java b/core/src/ru/deadsoftware/cavecraft/game/GameRenderer.java
index 3ffc0ae..648e785 100644
--- a/core/src/ru/deadsoftware/cavecraft/game/GameRenderer.java
+++ b/core/src/ru/deadsoftware/cavecraft/game/GameRenderer.java
@@ -28,14 +28,19 @@ public class GameRenderer extends Renderer {
         if (maxY>gameProc.world.getHeight()) maxY = gameProc.world.getHeight();
         for (int y=minY; y<maxY; y++) {
             for (int x=minX; x<maxX; x++) {
-                if (gameProc.world.getForeMap(x,y)>0){
-                } else if (gameProc.world.getBackMap(x,y)>0) {
+                if ((gameProc.world.getForeMap(x,y)==0 || Items.BLOCKS.getValueAt(gameProc.world.getForeMap(x,y)).transparent)
+                        && gameProc.world.getBackMap(x,y)>0) {
                     spriteBatch.draw(
-                            Items.BLOCKS.getValueAt(gameProc.world.getBackMap(x,y)).getTexture(),
+                            Assets.blockTextures[Items.BLOCKS.getValueAt(gameProc.world.getBackMap(x,y)).getTexture()],
                             x * 16 - camera.position.x,y * 16 - camera.position.y);
                     Assets.shade.setPosition(x * 16 - camera.position.x,y * 16 - camera.position.y);
                     Assets.shade.draw(spriteBatch);
                 }
+                if (gameProc.world.getForeMap(x,y)>0 && Items.BLOCKS.getValueAt(gameProc.world.getForeMap(x,y)).background) {
+                    spriteBatch.draw(
+                            Assets.blockTextures[Items.BLOCKS.getValueAt(gameProc.world.getForeMap(x,y)).getTexture()],
+                            x * 16 - camera.position.x,y * 16 - camera.position.y);
+                }
             }
         }
     }
@@ -51,7 +56,7 @@ public class GameRenderer extends Renderer {
             for (int x=minX; x<maxX; x++) {
                 if (gameProc.world.getForeMap(x,y)>0) {
                     spriteBatch.draw(
-                            Items.BLOCKS.getValueAt(gameProc.world.getForeMap(x,y)).getTexture(),
+                            Assets.blockTextures[Items.BLOCKS.getValueAt(gameProc.world.getForeMap(x,y)).getTexture()],
                             x * 16 - camera.position.x,y * 16 - camera.position.y);
                 }
             }
@@ -119,13 +124,13 @@ public class GameRenderer extends Renderer {
                 y+18+(gameProc.creativeScroll*(72/(gameProc.maxCreativeScroll+1))));
         for (int i=gameProc.creativeScroll*40; i<(gameProc.creativeScroll+1)*40; i++) {
             if (i>0 && i<Items.BLOCKS.size)
-                spriteBatch.draw(Items.BLOCKS.getValueAt(i).getTexture(),
+                spriteBatch.draw(Assets.blockTextures[Items.BLOCKS.getValueAt(i).getTexture()],
                         x+8+((i-gameProc.creativeScroll*40)%8)*18,
                         y+18+((i-gameProc.creativeScroll*40)/8)*18);
         }
         for (int i=0; i<9; i++) {
             if (gameProc.player.inventory[i]>0)
-                spriteBatch.draw(Items.BLOCKS.getValueAt(gameProc.player.inventory[i]).getTexture(),
+                spriteBatch.draw(Assets.blockTextures[Items.BLOCKS.getValueAt(gameProc.player.inventory[i]).getTexture()],
                         x+8+i*18, y+Assets.creativeInv.getRegionHeight()-24);
         }
     }
@@ -140,7 +145,7 @@ public class GameRenderer extends Renderer {
         spriteBatch.draw(Assets.invBar, camera.viewportWidth/2 - Assets.invBar.getRegionWidth()/2, 0);
         for (int i=0; i<9; i++) {
             if (gameProc.player.inventory[i]>0) {
-                spriteBatch.draw(Items.BLOCKS.getValueAt(gameProc.player.inventory[i]).getTexture(),
+                spriteBatch.draw(Assets.blockTextures[Items.BLOCKS.getValueAt(gameProc.player.inventory[i]).getTexture()],
                         camera.viewportWidth/2 - Assets.invBar.getRegionWidth()/2+3+i*20,
                         3);
             }