v0.2.3e: tonnes of fixes relating to WIP multi-quickslot implementation

2015-01-20 00:56:36 -05:00
parent e53c6b678f
commit 6e3c2223cd
13 changed files with 66 additions and 36 deletions
@@ -85,8 +85,12 @@ 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 )) {