X-Git-Url: https://deadsoftware.ru/gitweb?a=blobdiff_plain;f=core%2Fsrc%2Fru%2Fdeadsoftware%2Fcavedroid%2Fgame%2Fmobs%2FPlayer.java;h=70013367928b170cd8296542983c7780f2879b84;hb=47099181db7f7d785c9c471cbaca474ebcb67d95;hp=ebdd9c0dbed6281204809267f6ed0997f270925b;hpb=ed1189467d0d1b57df7ca1335f2134c08acae5ec;p=cavedroid.git

diff --git a/core/src/ru/deadsoftware/cavedroid/game/mobs/Player.java b/core/src/ru/deadsoftware/cavedroid/game/mobs/Player.java
index ebdd9c0..7001336 100644
--- a/core/src/ru/deadsoftware/cavedroid/game/mobs/Player.java
+++ b/core/src/ru/deadsoftware/cavedroid/game/mobs/Player.java
@@ -26,13 +26,12 @@ public class Player extends Mob {
 
     public final int[] inventory;
     public int slot;
-    public final int gameMode;
+    public int gameMode;
     public boolean swim;
     public float headRotation = 0f;
 
     public Player() {
         super(0, 0, 4, 30, randomDir(), Type.MOB, MAX_HEALTH);
-        this.gameMode = 1;
         inventory = new int[9];
         swim = false;
     }
@@ -77,6 +76,10 @@ public class Player extends Mob {
         }
     }
 
+    public void setCurrentInventorySlotItem(int itemId) {
+        inventory[slot] = itemId;
+    }
+
     @Override
     public float getSpeed() {
         return SPEED;
@@ -174,6 +177,7 @@ public class Player extends Mob {
 
         if (hitAnim < 30f || hitAnim > 90f) {
             if (hitting) {
+                hitAnim = MathUtils.clamp(hitAnim, 30f, 90f);
                 hitAnimDelta = -hitAnimDelta;
             } else  {
                 hitAnimDelta = ANIMATION_SPEED;