From 54ac6ade49393dba039c19117b094a72675812c6 Mon Sep 17 00:00:00 2001
From: Matthew Hoops
Date: Mon, 21 Mar 2011 11:46:21 -0400
Subject: MOHAWK: Don't error out when the ReturnStackID cannot be converted

---
 engines/mohawk/riven_saveload.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'engines')

diff --git a/engines/mohawk/riven_saveload.cpp b/engines/mohawk/riven_saveload.cpp
index c7b5cd01fd..bd839646d4 100644
--- a/engines/mohawk/riven_saveload.cpp
+++ b/engines/mohawk/riven_saveload.cpp
@@ -173,7 +173,7 @@ bool RivenSaveLoad::loadGame(Common::String filename) {
 			stackID = mapOldStackIDToNew(rawVariables[i]);
 		else if (name.equalsIgnoreCase("CurrentCardID"))
 			cardID = rawVariables[i];
-		else if (name.equalsIgnoreCase("ReturnStackID"))
+		else if (name.equalsIgnoreCase("ReturnStackID") && *var != 0) // if 0, the game did not use the variable yet
 			*var = mapOldStackIDToNew(rawVariables[i]);
 	}
 
-- 
cgit v1.2.3