Merging Source v1.7.2: item changes

2014-10-21 00:38:15 -04:00
parent 4a49763309
commit 13afc9df8d
32 changed files with 523 additions and 269 deletions
@@ -27,7 +27,7 @@ public class IronKey extends Key {

 	private static final String TXT_FROM_DEPTH = "iron key from depth %d";

-	public static int curDepthQunatity = 0;
+	public static int curDepthQuantity = 0;
 	
 	{
 		name = "iron key";
@@ -51,15 +51,13 @@ public class IronKey extends Key {
 		}
 		return result;
 	}
-	
-	@Override
-	public Item detach( Bag  bag ) {
-		Item result = super.detach( bag );
-		if (result != null && depth == Dungeon.depth) {
-			Dungeon.hero.belongings.countIronKeys();
-		}
-		return result;
-	}
+
+    @Override
+    public void onDetach( ) {
+        if (depth == Dungeon.depth) {
+            Dungeon.hero.belongings.countIronKeys();
+        }
+    }
 	
 	@Override
 	public String toString() {