X-Git-Url: https://deadsoftware.ru/gitweb?a=blobdiff_plain;f=core%2Fsrc%2Fru%2Fdeadsoftware%2Fcavedroid%2Fgame%2Fmobs%2FPlayer.java;h=46cb8cd1fc250d8fab4582ba23cad5e67e19b114;hb=36f78fdd1d4f8b9a1c77f8fbedc05e5675a5c288;hp=7f517df7b1ead5f070110a3ad7c50c1863f425ef;hpb=26df40fee82cb14e75d757aaee7e31008ff3e46c;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 7f517df..46cb8cd 100644 --- a/core/src/ru/deadsoftware/cavedroid/game/mobs/Player.java +++ b/core/src/ru/deadsoftware/cavedroid/game/mobs/Player.java @@ -175,8 +175,9 @@ public class Player extends Mob { } final Sprite sprite = item.getSprite(); + final boolean smallSprite = !item.isTool() || item.isShears(); - if (!item.isTool()) { + if (smallSprite) { sprite.setSize(Drop.DROP_SIZE, Drop.DROP_SIZE); } @@ -185,7 +186,7 @@ public class Player extends Mob { final SpriteOrigin spriteOrigin = item.getParams().getInHandSpriteOrigin(); final int handMultiplier = -getDirection().getBasis(); final float xOffset = (-1 + getDirection().getIndex()) * sprite.getWidth() + 4 + handMultiplier * (sprite.getWidth() * spriteOrigin.getX()); - final float yOffset = item.isTool() ? -sprite.getHeight() / 2 : 0; + final float yOffset = !smallSprite ? -sprite.getHeight() / 2 : 0; float rotate = anim + 30; @@ -210,7 +211,9 @@ public class Player extends Mob { sprite.setFlip(false, sprite.isFlipY()); sprite.setRotation(0); sprite.setOriginCenter(); - sprite.rotate90(looksRight()); + if (item.isTool()) { + sprite.rotate90(looksRight()); + } } public void startHitting() {