From 4ad00d9fe25db7ba58e0bee84b573a4796eee3a9 Mon Sep 17 00:00:00 2001 From: Evan Debenham Date: Tue, 3 Nov 2015 21:17:28 -0500 Subject: [PATCH] v0.3.2: fixed tengu causing quickslot crashes in some cases --- .../ui/QuickSlotButton.java | 32 +++++++++++-------- 1 file changed, 19 insertions(+), 13 deletions(-) diff --git a/src/com/shatteredpixel/shatteredpixeldungeon/ui/QuickSlotButton.java b/src/com/shatteredpixel/shatteredpixeldungeon/ui/QuickSlotButton.java index 75f0bdf0c..d9a85466e 100644 --- a/src/com/shatteredpixel/shatteredpixeldungeon/ui/QuickSlotButton.java +++ b/src/com/shatteredpixel/shatteredpixeldungeon/ui/QuickSlotButton.java @@ -170,20 +170,26 @@ public class QuickSlotButton extends Button implements WndBag.Listener { } private void useTargeting() { - - targeting = lastTarget != null && lastTarget.isAlive() && Dungeon.visible[lastTarget.pos]; - - if (targeting) { - if (Actor.chars().contains( lastTarget )) { - lastTarget.sprite.parent.add( crossM ); - crossM.point( DungeonTilemap.tileToWorld( lastTarget.pos ) ); - crossB.x = x + (width - crossB.width) / 2; - crossB.y = y + (height - crossB.height) / 2; - crossB.visible = true; - } else { - lastTarget = null; - } + + if (lastTarget != null && + Actor.chars().contains( lastTarget ) && + lastTarget.isAlive() && + Dungeon.visible[lastTarget.pos]) { + + targeting = true; + lastTarget.sprite.parent.add( crossM ); + crossM.point( DungeonTilemap.tileToWorld( lastTarget.pos ) ); + crossB.x = x + (width - crossB.width) / 2; + crossB.y = y + (height - crossB.height) / 2; + crossB.visible = true; + + } else { + + lastTarget = null; + targeting = false; + } + } public static int autoAim(Char target){