aboutsummaryrefslogtreecommitdiff
path: root/sword2
diff options
context:
space:
mode:
authorOliver Kiehl2003-09-14 21:10:14 +0000
committerOliver Kiehl2003-09-14 21:10:14 +0000
commitfe349d2d998a939c7f258d3a28cf00a148bb6225 (patch)
treeb9c935a0d2487742594c5d5bbc8b599debee2e8e /sword2
parentd91278198b40cb86d9816971904fbad1e9bcfbf3 (diff)
downloadscummvm-rg350-fe349d2d998a939c7f258d3a28cf00a148bb6225.tar.gz
scummvm-rg350-fe349d2d998a939c7f258d3a28cf00a148bb6225.tar.bz2
scummvm-rg350-fe349d2d998a939c7f258d3a28cf00a148bb6225.zip
enable ``proper'' -x loading
svn-id: r10255
Diffstat (limited to 'sword2')
-rw-r--r--sword2/sword2.cpp17
1 files changed, 2 insertions, 15 deletions
diff --git a/sword2/sword2.cpp b/sword2/sword2.cpp
index be72bbc020..1f5a1d8af3 100644
--- a/sword2/sword2.cpp
+++ b/sword2/sword2.cpp
@@ -43,6 +43,7 @@
#include "startup.h"
#include "sword2.h"
#include "sync.h"
+#include "save_rest.h"
#define MAX_PATH 260
@@ -310,24 +311,10 @@ void Sword2State::go()
-//check for restore game on startup - at the mo any passed argument is good enough to trigger this
- // if (lpCmdLine[0]) //non zero
if (_saveSlot != -1)
- {
- // RestoreGame(_saveSlot); use traditional way for now...
-
- Set_mouse(NORMAL_MOUSE_ID);
-
- if (!Restore_control()) // restore a game
- Start_game();
- }
- //-------------------------------------------------------------
- // release versions only (full-game and demo)
-// #if NDEBUG // comment this out for debug versions to start game automatically!
+ RestoreGame(_saveSlot);
else
Start_game();
-// #endif // comment this out for debug versions to start game automatically!
- //-------------------------------------------------------------
Zdebug("CALLING: InitialiseRenderCycle");