v0.2.4: refactored handling the quickslot when equipping.

src/com/shatteredpixel/shatteredpixeldungeon/items/EquipableItem.java

@@ -38,7 +38,14 @@ public abstract class EquipableItem extends Item {
     @Override
     public void execute( Hero hero, String action ) {
         if (action.equals( AC_EQUIP )) {
+	        //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 {

src/com/shatteredpixel/shatteredpixeldungeon/items/KindOfWeapon.java

@@ -49,12 +49,8 @@ public class KindOfWeapon extends EquipableItem {
 	@Override
 	public boolean doEquip( Hero hero ) {
 
-		int slot = Dungeon.quickslot.getSlot( this );
-
 		detachAll( hero.belongings.backpack );
 		
-		if (slot != -1) Dungeon.quickslot.setSlot( slot, this );
-		
 		if (hero.belongings.weapon == null || hero.belongings.weapon.doUnequip( hero, true )) {
 			
 			hero.belongings.weapon = this;

src/com/shatteredpixel/shatteredpixeldungeon/items/armor/Armor.java

@@ -93,12 +93,8 @@ public class Armor extends EquipableItem {
 	@Override
 	public boolean doEquip( Hero hero ) {
 		
-		int slot = Dungeon.quickslot.getSlot( this );
-		
 		detach( hero.belongings.backpack );
 
-		if (slot != -1) Dungeon.quickslot.setSlot( slot, this );
-		
 		if (hero.belongings.armor == null || hero.belongings.armor.doUnequip( hero, true, false )) {
 			
 			hero.belongings.armor = this;

src/com/shatteredpixel/shatteredpixeldungeon/items/artifacts/Artifact.java

@@ -80,12 +80,8 @@ public class Artifact extends KindofMisc {
                 hero.belongings.misc2 = this;
             }
 
-            int slot = Dungeon.quickslot.getSlot( this );
-
             detach( hero.belongings.backpack );
 
-            if (slot != -1) Dungeon.quickslot.setSlot( slot, this );
-
             activate( hero );
 
             cursedKnown = true;

src/com/shatteredpixel/shatteredpixeldungeon/items/rings/Ring.java

@@ -126,12 +126,8 @@ public class Ring extends KindofMisc {
 				hero.belongings.misc2 = this;
 			}
 
-			int slot = Dungeon.quickslot.getSlot( this );
-
 			detach( hero.belongings.backpack );
 			
-			if (slot != -1) Dungeon.quickslot.setSlot( slot, this );
-			
 			activate( hero );
 			
 			cursedKnown = true;