aboutsummaryrefslogtreecommitdiff
path: root/engines
diff options
context:
space:
mode:
authorMatthew Hoops2011-03-21 11:46:21 -0400
committerMatthew Hoops2011-03-21 12:15:14 -0400
commit54ac6ade49393dba039c19117b094a72675812c6 (patch)
tree97f55bdf7c0916822d7f065b2a20c8eb0d6e9716 /engines
parentbf4dc80419b12bb2415d42ee413162bf56019288 (diff)
downloadscummvm-rg350-54ac6ade49393dba039c19117b094a72675812c6.tar.gz
scummvm-rg350-54ac6ade49393dba039c19117b094a72675812c6.tar.bz2
scummvm-rg350-54ac6ade49393dba039c19117b094a72675812c6.zip
MOHAWK: Don't error out when the ReturnStackID cannot be converted
Diffstat (limited to 'engines')
-rw-r--r--engines/mohawk/riven_saveload.cpp2
1 files changed, 1 insertions, 1 deletions
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]);
}