v0.3.1: allowed wands to use targeting

This commit is contained in:
Evan Debenham 2015-06-26 10:42:50 -04:00
parent 179935fb87
commit 6d0f143c4b

View File

@ -21,6 +21,7 @@
package com.shatteredpixel.shatteredpixeldungeon.ui; package com.shatteredpixel.shatteredpixeldungeon.ui;
import com.shatteredpixel.shatteredpixeldungeon.items.EquipableItem; import com.shatteredpixel.shatteredpixeldungeon.items.EquipableItem;
import com.shatteredpixel.shatteredpixeldungeon.items.wands.Wand;
import com.watabou.noosa.Image; import com.watabou.noosa.Image;
import com.watabou.noosa.ui.Button; import com.watabou.noosa.ui.Button;
import com.shatteredpixel.shatteredpixeldungeon.Dungeon; import com.shatteredpixel.shatteredpixeldungeon.Dungeon;
@ -79,7 +80,8 @@ public class QuickSlotButton extends Button implements WndBag.Listener {
GameScene.handleCell( lastTarget.pos ); GameScene.handleCell( lastTarget.pos );
} else { } else {
Item item = select(slotNum); Item item = select(slotNum);
if (item instanceof EquipableItem) //FIXME: sloppy, should have a better way to decide if an item uses targeting.
if (item instanceof EquipableItem || item instanceof Wand)
useTargeting(); useTargeting();
item.execute( Dungeon.hero ); item.execute( Dungeon.hero );
} }