[Scummvm-cvs-logs] CVS: scummvm/scumm scummvm.cpp,2.545,2.546
Travis Howell
kirben at users.sourceforge.net
Thu Jan 15 02:15:01 CET 2004
Update of /cvsroot/scummvm/scummvm/scumm
In directory sc8-pr-cvs1:/tmp/cvs-serv9747/scumm
Modified Files:
scummvm.cpp
Log Message:
Set these to zero just to be safe.
Index: scummvm.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/scummvm.cpp,v
retrieving revision 2.545
retrieving revision 2.546
diff -u -d -r2.545 -r2.546
--- scummvm.cpp 14 Jan 2004 16:00:24 -0000 2.545
+++ scummvm.cpp 15 Jan 2004 10:14:17 -0000 2.546
@@ -987,10 +987,13 @@
// If requested, load a save game instead of running the boot script
if (_saveLoadFlag != 2 || !loadState(_saveLoadSlot, _saveLoadCompatible)) {
+ int args[16];
+ memset(args, 0, sizeof(args));
+ args[0] = _bootParam;
if (_gameId == GID_MANIAC && _version == 1 && _demoMode)
- runScript(9, 0, 0, &_bootParam);
+ runScript(9, 0, 0, args);
else
- runScript(1, 0, 0, &_bootParam);
+ runScript(1, 0, 0, args);
}
_saveLoadFlag = 0;
}
@@ -1434,8 +1437,11 @@
// HACK as in game save stuff isn't supported currently
if (_gameId == GID_LOOM || _gameId == GID_LOOM256) {
- int args = 2;
+ int args[16];
uint value;
+ memset(args, 0, sizeof(args));
+ args[0] = 2;
+
if (_features & GF_MACINTOSH)
value = 105;
else
@@ -1443,7 +1449,7 @@
byte restoreScript = (_features & GF_FMTOWNS) ? 17 : 18;
// if verbs should be shown restore them
if (VAR(value) == 2)
- runScript(restoreScript, 0, 0, &args);
+ runScript(restoreScript, 0, 0, args);
} else if (_version > 3) {
for (int i = 0; i < _numVerbs; i++)
drawVerb(i, 0);
More information about the Scummvm-git-logs
mailing list