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=2953d940989febecabc83467aff77e0de7c98623;hpb=7115b8cce5cc8469c03ea1fa1fc24506a1e2765e;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 2953d94..4c7d962 100644
--- a/core/src/ru/deadsoftware/cavecraft/game/objects/Player.java
+++ b/core/src/ru/deadsoftware/cavecraft/game/objects/Player.java
@@ -3,28 +3,32 @@ package ru.deadsoftware.cavecraft.game.objects;
 import com.badlogic.gdx.math.Rectangle;
 import com.badlogic.gdx.math.Vector2;
 
-public class Player {
+import java.io.Serializable;
 
-    public Vector2 position;
-    public Vector2 moveX, moveY;
-    public int width, height, dir;
+public class Player implements Serializable {
+
+    public static int ANIM_SPEED = 6;
+
+    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() {
-        position = new Vector2(0, 0);
-        moveX = new Vector2(0, 0);
-        moveY = new Vector2(0, 0);
-        width = 8;
+    public Player(Vector2 spawnPoint, int gameMode) {
+        this.gameMode = gameMode;
+        pos = spawnPoint.cpy();
+        move = new Vector2(0, 0);
+        width = 4;
         height = 30;
-        inventory = new int[9];
-        inventory[0] = 1;
-        inventory[1] = 2;
-        inventory[2] = 3;
+        texWidth = 8;
+        inv = new int[9];
     }
 
     public Rectangle getRect() {
-        return new Rectangle(position.x, position.y, width, height);
+        return new Rectangle(pos.x + 2, pos.y, width, height);
     }
 
 }