X-Git-Url: http://deadsoftware.ru/gitweb?a=blobdiff_plain;f=core%2Fsrc%2Fru%2Fdeadsoftware%2Fcavecraft%2Fgame%2Fobjects%2FPlayer.java;h=4a6c4d41682c36eca08ea7c288d3938df9f66acb;hb=84b8cd80e39699174969bfed0734e78b8ec09615;hp=0c5581a7ee2711999f526e52bbc77cafa4385a2e;hpb=7895e461428b3cd6db4c606373081f063a9e0a2b;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 0c5581a..4a6c4d4 100644
--- a/core/src/ru/deadsoftware/cavecraft/game/objects/Player.java
+++ b/core/src/ru/deadsoftware/cavecraft/game/objects/Player.java
@@ -3,23 +3,30 @@ 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 class Player implements Serializable {
+
+    public static int ANIM_SPEED = 6;
 
     public Vector2 position;
-    public Vector2 moveX, moveY;
-    public int width, height, dir;
+    public Vector2 move;
+    public int width, height, dir, texWidth;
     public boolean canJump;
+    public int[] inventory;
+    public boolean flyMode = false;
 
-    public Player() {
-        position = new Vector2(0, 0);
-        moveX = new Vector2(0, 0);
-        moveY = new Vector2(0, 0);
-        width = 8;
+    public Player(Vector2 spawnPoint) {
+        position = spawnPoint.cpy();
+        move = new Vector2(0, 0);
+        width = 4;
         height = 30;
+        texWidth = 8;
+        inventory = new int[9];
     }
 
     public Rectangle getRect() {
-        return new Rectangle(position.x, position.y, width, height);
+        return new Rectangle(position.x + 2, position.y, width, height);
     }
 
 }