X-Git-Url: https://deadsoftware.ru/gitweb?a=blobdiff_plain;f=core%2Fsrc%2Fru%2Fdeadsoftware%2Fcavedroid%2Fgame%2Fmobs%2FPlayer.java;h=70013367928b170cd8296542983c7780f2879b84;hb=28d6d78dbd87e28884700bf60d02e554755ae254;hp=34232f705e7e3fdf4303b6db6ecd16488de2c061;hpb=b62c3a39c63a5a558352627026c6019ff6110071;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 34232f7..7001336 100644 --- a/core/src/ru/deadsoftware/cavedroid/game/mobs/Player.java +++ b/core/src/ru/deadsoftware/cavedroid/game/mobs/Player.java @@ -76,6 +76,10 @@ public class Player extends Mob { } } + public void setCurrentInventorySlotItem(int itemId) { + inventory[slot] = itemId; + } + @Override public float getSpeed() { return SPEED; @@ -173,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;