From 0d78119ab7b7f7a8ae0f7eef41548171705dc592 Mon Sep 17 00:00:00 2001
From: Evan Debenham <Evan@ShatteredPixel.com>
Date: Tue, 10 Feb 2015 16:44:29 -0500
Subject: [PATCH] v0.2.4: corrected some quickslot errors

---
 .../shatteredpixeldungeon/QuickSlot.java           |  4 ++++
 .../shatteredpixeldungeon/ui/QuickSlotButton.java  | 14 +++-----------
 2 files changed, 7 insertions(+), 11 deletions(-)

diff --git a/src/com/shatteredpixel/shatteredpixeldungeon/QuickSlot.java b/src/com/shatteredpixel/shatteredpixeldungeon/QuickSlot.java
index c17532f1a..76112205c 100644
--- a/src/com/shatteredpixel/shatteredpixeldungeon/QuickSlot.java
+++ b/src/com/shatteredpixel/shatteredpixeldungeon/QuickSlot.java
@@ -54,6 +54,10 @@ public class QuickSlot {
         return getItem(slot) != null && getItem(slot).quantity() == 0;
     }
 
+	public Boolean isNonePlaceholder(int slot){
+		return getItem(slot) != null && getItem(slot).quantity() > 0;
+	}
+
     public void clearItem(Item item){
         if (contains(item))
             clearSlot(getSlot(item));
diff --git a/src/com/shatteredpixel/shatteredpixeldungeon/ui/QuickSlotButton.java b/src/com/shatteredpixel/shatteredpixeldungeon/ui/QuickSlotButton.java
index e7b7b48ef..7dff31aa0 100644
--- a/src/com/shatteredpixel/shatteredpixeldungeon/ui/QuickSlotButton.java
+++ b/src/com/shatteredpixel/shatteredpixeldungeon/ui/QuickSlotButton.java
@@ -30,22 +30,19 @@ import com.shatteredpixel.shatteredpixeldungeon.scenes.GameScene;
 import com.shatteredpixel.shatteredpixeldungeon.scenes.PixelScene;
 import com.shatteredpixel.shatteredpixeldungeon.windows.WndBag;
 
-//TODO: investigate targeting with multiple quickslots
 public class QuickSlotButton extends Button implements WndBag.Listener {
 
 	private static final String TXT_SELECT_ITEM = "Select an item for the quickslot";
 	
 	private static QuickSlotButton[] instance = new QuickSlotButton[4];
 	private int slotNum;
-	
-	private Item itemInSlot;
+
 	private ItemSlot slot;
 	
 	private static Image crossB;
 	private static Image crossM;
 	
 	private static boolean targeting = false;
-	private Item lastItem = null;
 	private static Char lastTarget= null;
 	
 	public QuickSlotButton( int slotNum ) {
@@ -61,8 +58,7 @@ public class QuickSlotButton extends Button implements WndBag.Listener {
 		super.destroy();
 		
 		instance = new QuickSlotButton[4];
-		
-		lastItem = null;
+
 		lastTarget = null;
 	}
 	
@@ -140,7 +136,6 @@ public class QuickSlotButton extends Button implements WndBag.Listener {
 	
 	public void item( Item item ) {
 		slot.item( item );
-		itemInSlot = item;
 		enableSlot();
 	}
 	
@@ -154,10 +149,7 @@ public class QuickSlotButton extends Button implements WndBag.Listener {
 	}
 	
 	private void enableSlot() {
-		slot.enable( 
-			itemInSlot != null && 
-			itemInSlot.quantity() > 0 && 
-			(Dungeon.hero.belongings.backpack.contains( itemInSlot ) || itemInSlot.isEquipped( Dungeon.hero )));
+		slot.enable(Dungeon.quickslot.isNonePlaceholder( slotNum ));
 	}
 	
 	private void useTargeting() {