aboutsummaryrefslogtreecommitdiff
path: root/engines/tinsel/tinsel.cpp
diff options
context:
space:
mode:
authorJohannes Schickel2009-05-25 13:40:46 +0000
committerJohannes Schickel2009-05-25 13:40:46 +0000
commitdb62ae8b332acf99e944d17e43b30485b153a6da (patch)
tree6bc5d83d37fdc497c833ea5a538e418241618686 /engines/tinsel/tinsel.cpp
parent71cc92ab7f79f6a5a4dc3ac03ecde0f5f27219f4 (diff)
downloadscummvm-rg350-db62ae8b332acf99e944d17e43b30485b153a6da.tar.gz
scummvm-rg350-db62ae8b332acf99e944d17e43b30485b153a6da.tar.bz2
scummvm-rg350-db62ae8b332acf99e944d17e43b30485b153a6da.zip
Till we specify an common behavior when loading a game state on startup fails / the user tries to load an non existing save slot, change Tinsel to start up the game as if no slot was specified. (This 'fixes' bug #2796215 "DW: Black screen when loading via command line")
svn-id: r40890
Diffstat (limited to 'engines/tinsel/tinsel.cpp')
-rw-r--r--engines/tinsel/tinsel.cpp8
1 files changed, 4 insertions, 4 deletions
diff --git a/engines/tinsel/tinsel.cpp b/engines/tinsel/tinsel.cpp
index a267a4ae44..5241459e9e 100644
--- a/engines/tinsel/tinsel.cpp
+++ b/engines/tinsel/tinsel.cpp
@@ -972,12 +972,12 @@ Common::Error TinselEngine::run() {
// Load game from specified slot, if any
//
- // TODO: We might want to think about taking care of possible errors
- // when loading the save state.
+ // TODO: We might want to think about properly taking care of possible
+ // errors when loading the save state.
if (ConfMan.hasKey("save_slot")) {
- loadGameState(ConfMan.getInt("save_slot"));
- loadingFromGMM = true;
+ if (loadGameState(ConfMan.getInt("save_slot")) == Common::kNoError)
+ loadingFromGMM = true;
}
// Foreground loop