X-Git-Url: http://deadsoftware.ru/gitweb?a=blobdiff_plain;f=core%2Fsrc%2Fru%2Fdeadsoftware%2Fcavecraft%2Fgame%2Fobjects%2FPlayer.java;h=4c7d962ca37c86d2dae698016bd45b83aa350bdc;hb=e31e819b4fc6afdc3612e0ada5066dab638e89ac;hp=546fb6ef7aaa307b2a98b4ad686cfbcb894f1832;hpb=bea2a3c5b967bcd90ccd83e08e833d58449e963a;p=cavedroid.git

diff --git a/core/src/ru/deadsoftware/cavecraft/game/objects/Player.java b/core/src/ru/deadsoftware/cavecraft/game/objects/Player.java
index 546fb6e..4c7d962 100644
--- a/core/src/ru/deadsoftware/cavecraft/game/objects/Player.java
+++ b/core/src/ru/deadsoftware/cavecraft/game/objects/Player.java
@@ -9,25 +9,26 @@ public class Player implements Serializable {
 
     public static int ANIM_SPEED = 6;
 
-    public Vector2 position;
-    public Vector2 moveX, moveY;
+    public Vector2 pos;
+    public Vector2 move;
     public int width, height, dir, texWidth;
     public boolean canJump;
-    public int[] inventory;
+    public int[] inv;
     public boolean flyMode = false;
+    public int gameMode;
 
-    public Player(Vector2 spawnPoint) {
-        position = spawnPoint.cpy();
-        moveX = new Vector2(0, 0);
-        moveY = new Vector2(0, 0);
+    public Player(Vector2 spawnPoint, int gameMode) {
+        this.gameMode = gameMode;
+        pos = spawnPoint.cpy();
+        move = new Vector2(0, 0);
         width = 4;
         height = 30;
         texWidth = 8;
-        inventory = new int[9];
+        inv = new int[9];
     }
 
     public Rectangle getRect() {
-        return new Rectangle(position.x + 2, position.y, width, height);
+        return new Rectangle(pos.x + 2, pos.y, width, height);
     }
 
 }