X-Git-Url: https://deadsoftware.ru/gitweb?p=cavedroid.git;a=blobdiff_plain;f=core%2Fsrc%2Fru%2Fdeadsoftware%2Fcavecraft%2Fgame%2FGameRenderer.java;h=96f8c786d9a0cb21ce98ef72659545a4f3c96063;hp=28a7c5687e26b33ede0bc94a285b02a75bf0fcd3;hb=be2690f1dee10f68a5ce6d576ace13c825ac5d15;hpb=5fd3c5a7647fbf36de84ff184f58fad5e0e30644

diff --git a/core/src/ru/deadsoftware/cavecraft/game/GameRenderer.java b/core/src/ru/deadsoftware/cavecraft/game/GameRenderer.java
index 28a7c56..96f8c78 100644
--- a/core/src/ru/deadsoftware/cavecraft/game/GameRenderer.java
+++ b/core/src/ru/deadsoftware/cavecraft/game/GameRenderer.java
@@ -88,21 +88,21 @@ public class GameRenderer extends Renderer {
 
     private void drawMob(Mob mob) {
         mob.draw(spriter,
-                mob.position.x - getCamX() - gp.world.getWidth() * 16, mob.position.y - getCamY());
+                mob.pos.x - getCamX() - gp.world.getWidth() * 16, mob.pos.y - getCamY());
         mob.draw(spriter,
-                mob.position.x - getCamX(), mob.position.y - getCamY());
+                mob.pos.x - getCamX(), mob.pos.y - getCamY());
         mob.draw(spriter,
-                mob.position.x - getCamX() + gp.world.getWidth() * 16, mob.position.y - getCamY());
+                mob.pos.x - getCamX() + gp.world.getWidth() * 16, mob.pos.y - getCamY());
     }
 
     private void drawDrop(Drop drop) {
         switch (GameItems.getItem(drop.getId()).getType()) {
             case 0:
-                Assets.blockTex[GameItems.getItem(drop.getId()).getTex()].setPosition(drop.position.x - getCamX() - gp.world.getWidth() * 16, drop.position.y - getCamY());
+                Assets.blockTex[GameItems.getItem(drop.getId()).getTex()].setPosition(drop.pos.x - getCamX() - gp.world.getWidth() * 16, drop.pos.y - getCamY());
                 Assets.blockTex[GameItems.getItem(drop.getId()).getTex()].draw(spriter);
-                Assets.blockTex[GameItems.getItem(drop.getId()).getTex()].setPosition(drop.position.x - getCamX(), drop.position.y - getCamY());
+                Assets.blockTex[GameItems.getItem(drop.getId()).getTex()].setPosition(drop.pos.x - getCamX(), drop.pos.y - getCamY());
                 Assets.blockTex[GameItems.getItem(drop.getId()).getTex()].draw(spriter);
-                Assets.blockTex[GameItems.getItem(drop.getId()).getTex()].setPosition(drop.position.x - getCamX() + gp.world.getWidth() * 16, drop.position.y - getCamY());
+                Assets.blockTex[GameItems.getItem(drop.getId()).getTex()].setPosition(drop.pos.x - getCamX() + gp.world.getWidth() * 16, drop.pos.y - getCamY());
                 Assets.blockTex[GameItems.getItem(drop.getId()).getTex()].draw(spriter);
         }
     }
@@ -124,50 +124,50 @@ public class GameRenderer extends Renderer {
 
         //back hand
         Assets.plSprite[1][2].setPosition(
-                pl.position.x - getCamX() - 6,
-                pl.position.y - getCamY());
+                pl.pos.x - getCamX() - 6,
+                pl.pos.y - getCamY());
         Assets.plSprite[1][2].draw(spriter);
         //back leg
         Assets.plSprite[1][3].setPosition(
-                pl.position.x - getCamX() - 6,
-                pl.position.y - getCamY() + 10);
+                pl.pos.x - getCamX() - 6,
+                pl.pos.y - getCamY() + 10);
         Assets.plSprite[1][3].draw(spriter);
         //front leg
         Assets.plSprite[0][3].setPosition(
-                pl.position.x - getCamX() - 6,
-                pl.position.y - getCamY() + 10);
+                pl.pos.x - getCamX() - 6,
+                pl.pos.y - getCamY() + 10);
         Assets.plSprite[0][3].draw(spriter);
         //head
         spriter.draw(Assets.plSprite[pl.dir][0],
-                pl.position.x - getCamX() - 2,
-                pl.position.y - getCamY() - 2);
+                pl.pos.x - getCamX() - 2,
+                pl.pos.y - getCamY() - 2);
         //body
         spriter.draw(Assets.plSprite[pl.dir][1],
-                pl.position.x - getCamX() - 2, pl.position.y - getCamY() + 8);
+                pl.pos.x - getCamX() - 2, pl.pos.y - getCamY() + 8);
         //item in hand
-        if (pl.inventory[gp.invSlot] > 0)
-            switch (GameItems.getItem(pl.inventory[gp.invSlot]).getType()) {
+        if (pl.inv[gp.slot] > 0)
+            switch (GameItems.getItem(pl.inv[gp.slot]).getType()) {
                 case 0:
-                    Assets.blockTex[GameItems.getItem(pl.inventory[gp.invSlot]).getTex()].setPosition(
-                            pl.position.x - getCamX() - 8 * MathUtils.sin(MathUtils.degRad * Assets.plSprite[0][2].getRotation()),
-                            pl.position.y - getCamY() + 6 + 8 * MathUtils.cos(MathUtils.degRad * Assets.plSprite[0][2].getRotation()));
-                    Assets.blockTex[GameItems.getItem(pl.inventory[gp.invSlot]).getTex()].draw(spriter);
+                    Assets.blockTex[GameItems.getItem(pl.inv[gp.slot]).getTex()].setPosition(
+                            pl.pos.x - getCamX() - 8 * MathUtils.sin(MathUtils.degRad * Assets.plSprite[0][2].getRotation()),
+                            pl.pos.y - getCamY() + 6 + 8 * MathUtils.cos(MathUtils.degRad * Assets.plSprite[0][2].getRotation()));
+                    Assets.blockTex[GameItems.getItem(pl.inv[gp.slot]).getTex()].draw(spriter);
                     break;
                 default:
-                    Assets.itemTex[GameItems.getItem(pl.inventory[gp.invSlot]).getTex()].flip((pl.dir == 0), false);
-                    Assets.itemTex[GameItems.getItem(pl.inventory[gp.invSlot]).getTex()].setRotation(
+                    Assets.itemTex[GameItems.getItem(pl.inv[gp.slot]).getTex()].flip((pl.dir == 0), false);
+                    Assets.itemTex[GameItems.getItem(pl.inv[gp.slot]).getTex()].setRotation(
                             -45 + pl.dir * 90 + Assets.plSprite[0][2].getRotation());
-                    Assets.itemTex[GameItems.getItem(pl.inventory[gp.invSlot]).getTex()].setPosition(
-                            pl.position.x - getCamX() - 10 + (12 * pl.dir) - 8 * MathUtils.sin(MathUtils.degRad * Assets.plSprite[0][2].getRotation()),
-                            pl.position.y - getCamY() + 2 + 8 * MathUtils.cos(MathUtils.degRad * Assets.plSprite[0][2].getRotation()));
-                    Assets.itemTex[GameItems.getItem(pl.inventory[gp.invSlot]).getTex()].draw(spriter);
-                    Assets.itemTex[GameItems.getItem(pl.inventory[gp.invSlot]).getTex()].flip((pl.dir == 0), false);
+                    Assets.itemTex[GameItems.getItem(pl.inv[gp.slot]).getTex()].setPosition(
+                            pl.pos.x - getCamX() - 10 + (12 * pl.dir) - 8 * MathUtils.sin(MathUtils.degRad * Assets.plSprite[0][2].getRotation()),
+                            pl.pos.y - getCamY() + 2 + 8 * MathUtils.cos(MathUtils.degRad * Assets.plSprite[0][2].getRotation()));
+                    Assets.itemTex[GameItems.getItem(pl.inv[gp.slot]).getTex()].draw(spriter);
+                    Assets.itemTex[GameItems.getItem(pl.inv[gp.slot]).getTex()].flip((pl.dir == 0), false);
                     break;
             }
         //front hand
         Assets.plSprite[0][2].setPosition(
-                pl.position.x - getCamX() - 6,
-                pl.position.y - getCamY());
+                pl.pos.x - getCamX() - 6,
+                pl.pos.y - getCamY());
         Assets.plSprite[0][2].draw(spriter);
     }
 
@@ -193,14 +193,14 @@ public class GameRenderer extends Renderer {
                 }
         }
         for (int i = 0; i < 9; i++) {
-            if (gp.player.inventory[i] > 0)
-                switch (GameItems.getItem(gp.player.inventory[i]).getType()) {
+            if (gp.player.inv[i] > 0)
+                switch (GameItems.getItem(gp.player.inv[i]).getType()) {
                     case 0:
-                        spriter.draw(Assets.blockTex[GameItems.getItem(gp.player.inventory[i]).getTex()],
+                        spriter.draw(Assets.blockTex[GameItems.getItem(gp.player.inv[i]).getTex()],
                                 x + 8 + i * 18, y + Assets.creativeInv.getRegionHeight() - 24);
                         break;
                     case 1:
-                        spriter.draw(Assets.itemTex[GameItems.getItem(gp.player.inventory[i]).getTex()],
+                        spriter.draw(Assets.itemTex[GameItems.getItem(gp.player.inv[i]).getTex()],
                                 x + 8 + i * 18, y + Assets.creativeInv.getRegionHeight() - 24);
                         break;
                 }
@@ -217,15 +217,15 @@ public class GameRenderer extends Renderer {
                     gp.curY * 16 - getCamY());
         spriter.draw(Assets.invBar, getWidth() / 2 - Assets.invBar.getRegionWidth() / 2, 0);
         for (int i = 0; i < 9; i++) {
-            if (gp.player.inventory[i] > 0) {
-                switch (GameItems.getItem(gp.player.inventory[i]).getType()) {
+            if (gp.player.inv[i] > 0) {
+                switch (GameItems.getItem(gp.player.inv[i]).getType()) {
                     case 0:
-                        spriter.draw(Assets.blockTex[GameItems.getItem(gp.player.inventory[i]).getTex()],
+                        spriter.draw(Assets.blockTex[GameItems.getItem(gp.player.inv[i]).getTex()],
                                 getWidth() / 2 - Assets.invBar.getRegionWidth() / 2 + 3 + i * 20,
                                 3);
                         break;
                     case 1:
-                        spriter.draw(Assets.itemTex[GameItems.getItem(gp.player.inventory[i]).getTex()],
+                        spriter.draw(Assets.itemTex[GameItems.getItem(gp.player.inv[i]).getTex()],
                                 getWidth() / 2 - Assets.invBar.getRegionWidth() / 2 + 3 + i * 20,
                                 3);
                         break;
@@ -233,7 +233,7 @@ public class GameRenderer extends Renderer {
             }
         }
         spriter.draw(Assets.invBarCur,
-                getWidth() / 2 - Assets.invBar.getRegionWidth() / 2 - 1 + 20 * gp.invSlot,
+                getWidth() / 2 - Assets.invBar.getRegionWidth() / 2 - 1 + 20 * gp.slot,
                 -1);
     }
 
@@ -279,8 +279,8 @@ public class GameRenderer extends Renderer {
 
         if (GameScreen.SHOW_DEBUG) {
             drawString("FPS: " + GameScreen.FPS, 0, 0);
-            drawString("X: " + (int) (gp.player.position.x / 16), 0, 10);
-            drawString("Y: " + (int) (gp.player.position.y / 16), 0, 20);
+            drawString("X: " + (int) (gp.player.pos.x / 16), 0, 10);
+            drawString("Y: " + (int) (gp.player.pos.y / 16), 0, 20);
             drawString("Mobs: " + gp.mobs.size(), 0, 30);
             drawString("Drops: " + gp.drops.size(), 0, 40);
             drawString("Block: " + GameItems.getBlockKey(gp.world.getForeMap(gp.curX, gp.curY)), 0, 50);