v0.2.4: refactored handling the quickslot when equipping.

2015-02-12 15:28:10 -05:00
parent d94847af4c
commit e4cfe7586a
5 changed files with 8 additions and 17 deletions
@@ -38,7 +38,14 @@ public abstract class EquipableItem extends Item {
    @Override
    public void execute( Hero hero, String action ) {
        if (action.equals( AC_EQUIP )) {
-            doEquip( hero );
+	        //In addition to equipping itself, item reassigns itself to the quickslot
+	        //This is a special case as the item is being removed from inventory, but is staying with the hero.
+	        int slot = Dungeon.quickslot.getSlot( this );
+            doEquip(hero);
+	        if (slot != -1) {
+		        Dungeon.quickslot.setSlot( slot, this );
+		        updateQuickslot();
+	        }
        } else if (action.equals( AC_UNEQUIP )) {
            doUnequip( hero, true );
        } else {