X-Git-Url: https://deadsoftware.ru/gitweb?a=blobdiff_plain;f=core%2Fsrc%2Fru%2Fdeadsoftware%2Fcavecraft%2Fgame%2Fobjects%2FPlayer.java;h=bcebde6f3d6198ae7ecba5185c4d3ff445ccabe6;hb=40312aaac2ec8bd1247ad5979f7bd1d8e47ecae3;hp=c63e0595449265aba12da75e3cf947424ddbd167;hpb=a6ec412e508cfa8679dcf32e69600fbb939122af;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 c63e059..bcebde6 100644
--- a/core/src/ru/deadsoftware/cavecraft/game/objects/Player.java
+++ b/core/src/ru/deadsoftware/cavecraft/game/objects/Player.java
@@ -1,24 +1,41 @@
 package ru.deadsoftware.cavecraft.game.objects;
 
+import com.badlogic.gdx.math.RandomXS128;
 import com.badlogic.gdx.math.Rectangle;
 import com.badlogic.gdx.math.Vector2;
+import ru.deadsoftware.cavecraft.Assets;
+import ru.deadsoftware.cavecraft.game.WorldGen;
 
 public class Player {
 
     public Vector2 position;
     public Vector2 moveX, moveY;
-    public int width, height, dir;
+    public int width, height, dir, texWidth;
+    public boolean canJump;
+    public int[] inventory;
+    public boolean flyMode = false;
 
-    public Player() {
-        position = new Vector2(0, 0);
+    public Player(int x, int y) {
+        position = new Vector2(x, y);
         moveX = new Vector2(0, 0);
         moveY = new Vector2(0, 0);
-        width = 8;
+        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;
     }
 
     public Rectangle getRect() {
-        return new Rectangle(position.x, position.y, width, height);
+        return new Rectangle(position.x+2, position.y, width, height);
     }
 
 }