LingASDJ/Magic_Ling_Pixel_Dungeon
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

v0.3.2: fixed tengu causing quickslot crashes in some cases

Browse Source
This commit is contained in:
Evan Debenham 2015-11-03 21:17:28 -05:00
parent 4b2bfb3eb9
commit 4ad00d9fe2
1 changed files with 19 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/com/shatteredpixel/shatteredpixeldungeon/ui/QuickSlotButton.java
View File

@ -171,19 +171,25 @@ public class QuickSlotButton extends Button implements WndBag.Listener {
private void useTargeting() { private void useTargeting() {
targeting = lastTarget != null && lastTarget.isAlive() && Dungeon.visible[lastTarget.pos]; if (lastTarget != null &&
Actor.chars().contains( lastTarget ) &&
lastTarget.isAlive() &&
Dungeon.visible[lastTarget.pos]) {
if (targeting) { targeting = true;
if (Actor.chars().contains( lastTarget )) {
lastTarget.sprite.parent.add( crossM ); lastTarget.sprite.parent.add( crossM );
crossM.point( DungeonTilemap.tileToWorld( lastTarget.pos ) ); crossM.point( DungeonTilemap.tileToWorld( lastTarget.pos ) );
crossB.x = x + (width - crossB.width) / 2; crossB.x = x + (width - crossB.width) / 2;
crossB.y = y + (height - crossB.height) / 2; crossB.y = y + (height - crossB.height) / 2;
crossB.visible = true; crossB.visible = true;
} else { } else {
lastTarget = null; lastTarget = null;
targeting = false;
} }
}
} }
public static int autoAim(Char target){ public static int autoAim(Char target){