Add items

[cavedroid.git] / core / src / ru / deadsoftware / cavecraft / game / GameRenderer.java

diff --git a/core/src/ru/deadsoftware/cavecraft/game/GameRenderer.java b/core/src/ru/deadsoftware/cavecraft/game/GameRenderer.java
index d8063264b58fb34102d6dc2ed0ce5dc345af613e..1eef325463a41614b6d98714ba21110ffb2e5af5 100644 (file)
--- a/core/src/ru/deadsoftware/cavecraft/game/GameRenderer.java
+++ b/core/src/ru/deadsoftware/cavecraft/game/GameRenderer.java
@@ -126,15 +126,17 @@ public class GameRenderer extends Renderer {
         spriteBatch.draw(Assets.creativeScroll, x+156,
                 y+18+(gameProc.creativeScroll*(72/gameProc.maxCreativeScroll)));
         for (int i=gameProc.creativeScroll*8; i<gameProc.creativeScroll*8+40; i++) {
-            if (i>0 && i<Items.BLOCKS.size)
-                spriteBatch.draw(Assets.blockTextures[Items.BLOCKS.getValueAt(i).getTexture()],
-                        x+8+((i-gameProc.creativeScroll*8)%8)*18,
-                        y+18+((i-gameProc.creativeScroll*8)/8)*18);
+            if (i>0 && i<Items.ITEMS.size())
+                if (Items.ITEMS.get(i).getType() == 0)
+                    spriteBatch.draw(Assets.blockTextures[Items.ITEMS.get(i).getTexture()],
+                            x+8+((i-gameProc.creativeScroll*8)%8)*18,
+                            y+18+((i-gameProc.creativeScroll*8)/8)*18);
         }
         for (int i=0; i<9; i++) {
             if (gameProc.player.inventory[i]>0)
-                spriteBatch.draw(Assets.blockTextures[Items.BLOCKS.getValueAt(gameProc.player.inventory[i]).getTexture()],
-                        x+8+i*18, y+Assets.creativeInv.getRegionHeight()-24);
+                if (Items.ITEMS.get(i).getType() == 0)
+                    spriteBatch.draw(Assets.blockTextures[Items.ITEMS.get(i).getTexture()],
+                            x+8+i*18, y+Assets.creativeInv.getRegionHeight()-24);
         }
     }
 
@@ -149,9 +151,10 @@ 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(Assets.blockTextures[Items.BLOCKS.getValueAt(gameProc.player.inventory[i]).getTexture()],
-                        camera.viewportWidth/2 - Assets.invBar.getRegionWidth()/2+3+i*20,
-                        3);
+                if (Items.ITEMS.get(gameProc.player.inventory[i]).getType()==0)
+                    spriteBatch.draw(Assets.blockTextures[Items.ITEMS.get(gameProc.player.inventory[i]).getTexture()],
+                            camera.viewportWidth/2 - Assets.invBar.getRegionWidth()/2+3+i*20,
+                            3);
             }
         }
         spriteBatch.draw(Assets.invBarCur,