Rename position -> pos

[cavedroid.git] / core / src / ru / deadsoftware / cavecraft / game / objects / Player.java

diff --git a/core/src/ru/deadsoftware/cavecraft/game/objects/Player.java b/core/src/ru/deadsoftware/cavecraft/game/objects/Player.java
index 56aa9c1e4d098aef7d371f1be9083a9602b58484..74f7249c751030d1778e03b55b2c11acec8d1337 100644 (file)
--- a/core/src/ru/deadsoftware/cavecraft/game/objects/Player.java
+++ b/core/src/ru/deadsoftware/cavecraft/game/objects/Player.java
@@ -3,29 +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 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 Player() {
-        position = new Vector2(0, 0);
-        moveX = new Vector2(0, 0);
-        moveY = new Vector2(0, 0);
+    public Player(Vector2 spawnPoint) {
+        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+2, position.y, width, height);
+        return new Rectangle(pos.x + 2, pos.y, width, height);
     }
 
 }