X-Git-Url: http://deadsoftware.ru/gitweb?p=cavedroid.git;a=blobdiff_plain;f=core%2Fsrc%2Fru%2Fdeadsoftware%2Fcavecraft%2Fgame%2FGameRenderer.java;h=3d3a8f60b8a67b6999e81a097bdacb5dcf939d44;hp=ee9d6d4d9d68c83542c76877831bfc851259e784;hb=0b8922bfbb2bbec067b532ecb7912f6afe02c4ef;hpb=1cc111dfe31e7f7098e01afeaa025e19f91aa624

diff --git a/core/src/ru/deadsoftware/cavecraft/game/GameRenderer.java b/core/src/ru/deadsoftware/cavecraft/game/GameRenderer.java
index ee9d6d4..3d3a8f6 100644
--- a/core/src/ru/deadsoftware/cavecraft/game/GameRenderer.java
+++ b/core/src/ru/deadsoftware/cavecraft/game/GameRenderer.java
@@ -9,6 +9,7 @@ import com.badlogic.gdx.math.Vector2;
 import ru.deadsoftware.cavecraft.CaveGame;
 import ru.deadsoftware.cavecraft.GameScreen;
 import ru.deadsoftware.cavecraft.game.mobs.Mob;
+import ru.deadsoftware.cavecraft.game.objects.Drop;
 import ru.deadsoftware.cavecraft.game.objects.Player;
 import ru.deadsoftware.cavecraft.misc.Assets;
 import ru.deadsoftware.cavecraft.misc.Renderer;
@@ -76,6 +77,18 @@ public class GameRenderer extends Renderer {
                 mob.position.x-camera.position.x+gameProc.world.getWidth()*16, mob.position.y-camera.position.y);
     }
 
+    private void drawDrop(Drop drop) {
+        switch (Items.ITEMS.get(drop.getId()).getType()) {
+            case 0:
+                Assets.blockTextures[Items.ITEMS.get(drop.getId()).getTexture()].setPosition(drop.position.x-camera.position.x-gameProc.world.getWidth()*16, drop.position.y-camera.position.y);
+                Assets.blockTextures[Items.ITEMS.get(drop.getId()).getTexture()].draw(spriteBatch);
+                Assets.blockTextures[Items.ITEMS.get(drop.getId()).getTexture()].setPosition(drop.position.x-camera.position.x, drop.position.y-camera.position.y);
+                Assets.blockTextures[Items.ITEMS.get(drop.getId()).getTexture()].draw(spriteBatch);
+                Assets.blockTextures[Items.ITEMS.get(drop.getId()).getTexture()].setPosition(drop.position.x-camera.position.x+gameProc.world.getWidth()*16, drop.position.y-camera.position.y);
+                Assets.blockTextures[Items.ITEMS.get(drop.getId()).getTexture()].draw(spriteBatch);
+        }
+    }
+
     private void drawPlayer(Player pl) {
         if (!pl.moveX.equals(Vector2.Zero) || Assets.playerSprite[0][2].getRotation()!=0) {
             Assets.playerSprite[0][2].rotate(Player.ANIM_SPEED);
@@ -177,6 +190,13 @@ public class GameRenderer extends Renderer {
     }
 
     private void drawGUI() {
+        if (gameProc.blockDmg > 0) {
+            spriteBatch.draw(Assets.wreck[
+                            10*gameProc.blockDmg/
+                                    Items.BLOCKS.getValueAt(gameProc.world.getForeMap(gameProc.cursorX, gameProc.cursorY)).getHp()],
+                    gameProc.cursorX*16-camera.position.x,
+                    gameProc.cursorY*16-camera.position.y);
+        }
         if (gameProc.world.getForeMap(gameProc.cursorX, gameProc.cursorY)>0 ||
                 gameProc.world.getBackMap(gameProc.cursorX, gameProc.cursorY)>0 ||
                 gameProc.ctrlMode==1 ||
@@ -224,6 +244,7 @@ public class GameRenderer extends Renderer {
         drawWorldBackground();
         drawPlayer(gameProc.player);
         for (Mob mob : gameProc.mobs) drawMob(mob);
+        for (Drop drop : gameProc.drops) drawDrop(drop);
         drawWorldForeground();
         drawGUI();
     }
@@ -250,7 +271,8 @@ public class GameRenderer extends Renderer {
             drawString("X: "+(int)(gameProc.player.position.x/16),0, 10);
             drawString("Y: "+(int)(gameProc.player.position.y/16),0, 20);
             drawString("Mobs: "+gameProc.mobs.size(), 0, 30);
-            drawString("Block: "+Items.BLOCKS.getKeyAt(gameProc.world.getForeMap(gameProc.cursorX, gameProc.cursorY)), 0, 40);
+            drawString("Drops: "+gameProc.drops.size(), 0, 40);
+            drawString("Block: "+Items.BLOCKS.getKeyAt(gameProc.world.getForeMap(gameProc.cursorX, gameProc.cursorY)), 0, 50);
         }
 
         spriteBatch.end();