diff options
| author | Travis Howell | 2004-01-15 10:14:17 +0000 |
|---|---|---|
| committer | Travis Howell | 2004-01-15 10:14:17 +0000 |
| commit | 4c4968839a50b4c62ecce66cab744245c9bab5a1 (patch) | |
| tree | 0cd6f369127e5cc991c2c3a43033994afaca53e9 /scumm | |
| parent | 69c935a26e54d6339f75d4a960e3b79ccd88be6c (diff) | |
| download | scummvm-rg350-4c4968839a50b4c62ecce66cab744245c9bab5a1.tar.gz scummvm-rg350-4c4968839a50b4c62ecce66cab744245c9bab5a1.tar.bz2 scummvm-rg350-4c4968839a50b4c62ecce66cab744245c9bab5a1.zip | |
Set these to zero just to be safe.
svn-id: r12407
Diffstat (limited to 'scumm')
| -rw-r--r-- | scumm/scummvm.cpp | 14 |
1 files changed, 10 insertions, 4 deletions
diff --git a/scumm/scummvm.cpp b/scumm/scummvm.cpp index 35f7952610..e96dacc5ee 100644 --- a/scumm/scummvm.cpp +++ b/scumm/scummvm.cpp @@ -987,10 +987,13 @@ void ScummEngine::launch() { // 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 @@ load_game: // 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 @@ load_game: 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); |