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=9e2f3dd55238b18d6890794ecf7260b029e28729;hpb=6ab2a53526f16de139d39a59c3d800e5f3013c68;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 9e2f3dd..4c7d962 100644
--- a/core/src/ru/deadsoftware/cavecraft/game/objects/Player.java
+++ b/core/src/ru/deadsoftware/cavecraft/game/objects/Player.java
@@ -9,34 +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];
-        inventory[0] = 1;
-        inventory[1] = 2;
-        inventory[2] = 3;
-        inventory[3] = 4;
-        inventory[4] = 5;
-        inventory[5] = 6;
-        inventory[6] = 7;
-        inventory[7] = 8;
-        inventory[8] = 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);
     }
 
 }