Fix loading callbacks from saved inventories.

Author: bladecoder

blade-engine/src/com/bladecoder/engine/model/World.java

@@ -1266,8 +1266,18 @@ public void read(Json json, JsonValue jsonData) {
 				getInkManager().read(json, jsonData.get("inkManager"));
 			}
 
-			inventories = json.readValue("inventories", HashMap.class, Inventory.class, jsonData);
+			// inventories have to be put in the hash to find the actors when reading saved data
 			currentInventory = json.readValue("currentInventory", String.class, jsonData);
+			
+			JsonValue jsonInventories = jsonData.get("inventories");
+			inventories = new HashMap<String,Inventory>();
+			
+			for (int i = 0; i < jsonInventories.size; i++) {
+				JsonValue jsonValue = jsonInventories.get(i);
+				Inventory inv = new Inventory();
+				inventories.put(jsonValue.name, inv);
+				inv.read(json, jsonValue);
+			}
 
 			if (jsonData.get("uiActors") != null) {
 				getUIActors().read(json, jsonData.get("uiActors"));

blade-engine/src/com/bladecoder/engine/util/ActionCallbackSerialization.java

@@ -20,6 +20,7 @@
 import com.bladecoder.engine.ink.InkManager;
 import com.bladecoder.engine.model.BaseActor;
 import com.bladecoder.engine.model.InteractiveActor;
+import com.bladecoder.engine.model.Inventory;
 import com.bladecoder.engine.model.Scene;
 import com.bladecoder.engine.model.UIActors;
 import com.bladecoder.engine.model.Verb;
@@ -48,6 +49,7 @@ public class ActionCallbackSerialization {
 	private static final String SEPARATION_SYMBOL = "#";
 	private static final String INK_MANAGER_TAG = "INK_MANAGER";
 	private static final String UIACTORS_TAG = "UIACTORS";
+	private static final String INVENTORY_TAG = "INVENTORY";
 	private static final String DEFAULT_VERB_TAG = "DEFAULT_VERB";
 
 	private static String find(ActionCallback cb, Verb v) {
@@ -152,6 +154,22 @@ private static String find(ActionCallback cb, UIActors uia) {
 
 		return null;
 	}
+	
+	private static String find(ActionCallback cb, Inventory inv) {
+		for (int i =0; i < inv.getNumItems(); i++) {
+			InteractiveActor a = inv.get(i);
+			String id = find(cb, a);
+
+			if (id != null) {
+				StringBuilder stringBuilder = new StringBuilder(INVENTORY_TAG);
+				stringBuilder.append(SEPARATION_SYMBOL).append(id);
+
+				return stringBuilder.toString();
+			}
+		}
+
+		return null;
+	}
 
 	/**
 	 * Generates a String for serialization that allows locate the
@@ -171,6 +189,12 @@ public static String find(ActionCallback cb) {
 		// search in UIActors
 		id = find(cb, World.getInstance().getUIActors());
 
+		if (id != null)
+			return id;
+		
+		// search in inventory
+		id = find(cb, World.getInstance().getInventory());
+
 		if (id != null)
 			return id;
 
@@ -188,6 +212,7 @@ public static String find(ActionCallback cb) {
 		if (id != null)
 			return id;
 
+		// search in player
 		id = find(cb, s.getPlayer());
 		if (id != null)
 			return id;
@@ -248,7 +273,7 @@ public static ActionCallback find(String id) {
 		String verbId;
 		int actionPos = -1;
 
-		if (id.startsWith(UIACTORS_TAG)) {
+		if (id.startsWith(UIACTORS_TAG) || id.startsWith(INVENTORY_TAG)) {
 
 			actorId = split[1];
 			verbId = split[2];
@@ -276,15 +301,20 @@ public static ActionCallback find(String id) {
 			} else {
 				a = (InteractiveActor) s.getActor(actorId, true);
 
-				if (a == null)
+				if (a == null) {
+					EngineLogger.error("ActionCallbackSerialization - Actor not found: " + actorId + " cb: " + id);
 					return null;
+				}
 
 				v = a.getVerbManager().getVerbs().get(verbId);
 			}
 		}
 
-		if (v == null)
+		if (v == null) {
+			EngineLogger.error("ActionCallbackSerialization - Verb not found: " + verbId + " cb: " + id);
+			
 			return null;
+		}
 
 		if (actionPos == -1)
 			return v;
@@ -293,6 +323,8 @@ public static ActionCallback find(String id) {
 
 		if (action instanceof ActionCallback)
 			return (ActionCallback) action;
+		
+		EngineLogger.error("ActionCallbackSerialization - CB not found: " + id);
 
 		return null;
 	}