diff --git a/core/src/ru/deadsoftware/cavedroid/game/mobs/Player.java b/core/src/ru/deadsoftware/cavedroid/game/mobs/Player.java
index d6d848c12621aad20fd0c6c471814aaaf60b26c6..3c33ee574efefe17a1010f8a96694a42b67e1744 100644 (file)
import com.badlogic.gdx.graphics.g2d.SpriteBatch;
import com.badlogic.gdx.math.MathUtils;
import com.badlogic.gdx.math.Vector2;
-import ru.deadsoftware.cavedroid.game.GameItems;
import ru.deadsoftware.cavedroid.game.GameItemsHolder;
import ru.deadsoftware.cavedroid.game.model.item.Item;
import ru.deadsoftware.cavedroid.game.objects.Drop;
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;
private float hitAnim = 0f;
private float hitAnimDelta = ANIMATION_SPEED;
- public final int[] inventory;
+ public final Item[] inventory;
public int slot;
public int gameMode;
public boolean swim;
public float headRotation = 0f;
- public Player() {
+ public Player(GameItemsHolder gameItemsHolder) {
super(0, 0, 4, 30, randomDir(), Type.MOB, MAX_HEALTH);
- inventory = new int[9];
+ inventory = new Item[9];
+ for (int i = 0; i < 9; i++) {
+ inventory[i] = gameItemsHolder.getFallbackItem();
+ }
swim = false;
}
public void pickUpDrop(Drop drop) {
for (int i = 0; i < inventory.length; i++) {
- if (inventory[i] == 0 || inventory[i] == drop.getId()) {
- inventory[i] = drop.getId();
+ if (inventory[i] == null || inventory[i].getParams().getKey().equals(GameItemsHolder.FALLBACK_ITEM_KEY) || inventory[i] == drop.getItem()) {
+ inventory[i] = drop.getItem();
drop.setPickedUp(true);
break;
}
}
}
- public void setCurrentInventorySlotItem(int itemId) {
- inventory[slot] = itemId;
+ public void setCurrentInventorySlotItem(Item item) {
+ inventory[slot] = item;
}
@Override
}
private void drawItem(SpriteBatch spriteBatch, float x, float y, float anim) {
- final int itemId = inventory[slot];
+ final Item item = inventory[slot];
- if (itemId == 0) {
+ if (item == null || item.getParams().getKey().equals(GameItemsHolder.FALLBACK_ITEM_KEY)) {
return;
}
- final Item item = GameItems.getItem(itemId);
final Sprite sprite = item.getSprite();
if (!item.isTool()) {