Fix saves

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

diff --git a/core/src/ru/deadsoftware/cavedroid/game/mobs/Player.java b/core/src/ru/deadsoftware/cavedroid/game/mobs/Player.java
index 3c33ee574efefe17a1010f8a96694a42b67e1744..bce9a2c435a0da4e2d81c794af791f95f55d9a49 100644 (file)
--- a/core/src/ru/deadsoftware/cavedroid/game/mobs/Player.java
+++ b/core/src/ru/deadsoftware/cavedroid/game/mobs/Player.java
@@ -5,6 +5,7 @@ import com.badlogic.gdx.graphics.g2d.SpriteBatch;
 import com.badlogic.gdx.math.MathUtils;
 import com.badlogic.gdx.math.Vector2;
 import ru.deadsoftware.cavedroid.game.GameItemsHolder;
+import ru.deadsoftware.cavedroid.game.model.item.InventoryItem;
 import ru.deadsoftware.cavedroid.game.model.item.Item;
 import ru.deadsoftware.cavedroid.game.objects.Drop;
 import ru.deadsoftware.cavedroid.game.world.GameWorld;
@@ -12,6 +13,8 @@ import ru.deadsoftware.cavedroid.misc.Assets;
 import ru.deadsoftware.cavedroid.misc.utils.SpriteOrigin;
 import ru.deadsoftware.cavedroid.misc.utils.SpriteUtilsKt;
 
+import javax.annotation.CheckForNull;
+
 public class Player extends Mob {
 
     private static final float SPEED = 69.072f;
@@ -22,7 +25,7 @@ public class Player extends Mob {
     private float hitAnim = 0f;
     private float hitAnimDelta = ANIMATION_SPEED;
 
-    public final Item[] inventory;
+    public final InventoryItem[] inventory;
     public int slot;
     public int gameMode;
     public boolean swim;
@@ -30,13 +33,24 @@ public class Player extends Mob {
 
     public Player(GameItemsHolder gameItemsHolder) {
         super(0, 0, 4, 30, randomDir(), Type.MOB, MAX_HEALTH);
-        inventory = new Item[9];
+        inventory = new InventoryItem[9];
         for (int i = 0; i < 9; i++) {
-            inventory[i] = gameItemsHolder.getFallbackItem();
+            inventory[i] = gameItemsHolder.getFallbackItem().toInventoryItem();
         }
         swim = false;
     }
 
+    public void initInventory(GameItemsHolder gameItemsHolder) {
+        for (InventoryItem invItem : inventory) {
+            invItem.init(gameItemsHolder);
+        }
+    }
+
+    @CheckForNull
+    public Item inventory(int i) {
+        return inventory[i].getItem();
+    }
+    
     public void respawn(GameWorld gameWorld, GameItemsHolder itemsHolder) {
         Vector2 pos = getSpawnPoint(gameWorld, itemsHolder);
         this.x = pos.x;
@@ -48,8 +62,8 @@ public class Player extends Mob {
 
     public void pickUpDrop(Drop drop) {
         for (int i = 0; i < inventory.length; i++) {
-            if (inventory[i] == null || inventory[i].getParams().getKey().equals(GameItemsHolder.FALLBACK_ITEM_KEY) || inventory[i] == drop.getItem()) {
-                inventory[i] = drop.getItem();
+            if (inventory(i) == null || inventory(i).getParams().getKey().equals(GameItemsHolder.FALLBACK_ITEM_KEY) || inventory(i) == drop.getItem()) {
+                inventory[i] = drop.getItem().toInventoryItem();
                 drop.setPickedUp(true);
                 break;
             }
@@ -78,7 +92,7 @@ public class Player extends Mob {
     }
 
     public void setCurrentInventorySlotItem(Item item) {
-        inventory[slot] = item;
+        inventory[slot] = item.toInventoryItem();
     }
 
     @Override
@@ -116,7 +130,7 @@ public class Player extends Mob {
     }
 
     private void drawItem(SpriteBatch spriteBatch, float x, float y, float anim) {
-        final Item item = inventory[slot];
+        final Item item = inventory(slot);
 
         if (item == null || item.getParams().getKey().equals(GameItemsHolder.FALLBACK_ITEM_KEY)) {
             return;