[Scummvm-cvs-logs] CVS: scummvm/bs2 sword2.cpp,1.26,1.27
Oliver Kiehl
olki at users.sourceforge.net
Sun Sep 14 14:11:02 CEST 2003
- Previous message: [Scummvm-cvs-logs] CVS: scummvm/scumm imuse.cpp,2.91,2.92 resource.cpp,1.159,1.160 saveload.cpp,1.109,1.110 saveload.h,1.23,1.24
- Next message: [Scummvm-cvs-logs] CVS: scummvm/bs2 save_rest.cpp,1.13,1.14 save_rest.h,1.1,1.2 sword2.cpp,1.27,1.28
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Update of /cvsroot/scummvm/scummvm/bs2
In directory sc8-pr-cvs1:/tmp/cvs-serv27507
Modified Files:
sword2.cpp
Log Message:
enable ``proper'' -x loading
Index: sword2.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/bs2/sword2.cpp,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -d -r1.26 -r1.27
--- sword2.cpp 9 Sep 2003 12:45:33 -0000 1.26
+++ sword2.cpp 14 Sep 2003 21:10:14 -0000 1.27
@@ -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 @@
-//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");
- Previous message: [Scummvm-cvs-logs] CVS: scummvm/scumm imuse.cpp,2.91,2.92 resource.cpp,1.159,1.160 saveload.cpp,1.109,1.110 saveload.h,1.23,1.24
- Next message: [Scummvm-cvs-logs] CVS: scummvm/bs2 save_rest.cpp,1.13,1.14 save_rest.h,1.1,1.2 sword2.cpp,1.27,1.28
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the Scummvm-git-logs
mailing list