diff options
author | Max Horn | 2004-11-23 09:36:46 +0000 |
---|---|---|
committer | Max Horn | 2004-11-23 09:36:46 +0000 |
commit | 8069f3003030c2e4be683d259914e602827f0621 (patch) | |
tree | 57f3f702304ed628194593f97370e542179d075c | |
parent | bc34d0d5624d79e84e3d797724ece85b80102e40 (diff) | |
download | scummvm-rg350-8069f3003030c2e4be683d259914e602827f0621.tar.gz scummvm-rg350-8069f3003030c2e4be683d259914e602827f0621.tar.bz2 scummvm-rg350-8069f3003030c2e4be683d259914e602827f0621.zip |
Moved bootscript loading into go(), where it belongs
svn-id: r15868
-rw-r--r-- | scumm/scumm.cpp | 33 |
1 files changed, 16 insertions, 17 deletions
diff --git a/scumm/scumm.cpp b/scumm/scumm.cpp index 7df2d8d8ec..bdb91a1d99 100644 --- a/scumm/scumm.cpp +++ b/scumm/scumm.cpp @@ -1066,7 +1066,7 @@ int ScummEngine::init() { } if (_features & GF_OLD_BUNDLE) - _resourceHeaderSize = 4; // FIXME - to be rechecked + _resourceHeaderSize = 4; else if (_features & GF_SMALL_HEADER) _resourceHeaderSize = 6; else @@ -1099,22 +1099,6 @@ int ScummEngine::init() { if (!_debugger) _debugger = new ScummDebugger(this); - - // If requested, load a save game instead of running the boot script - if (_saveLoadFlag != 2 || !loadState(_saveLoadSlot, _saveTemporaryState)) { - int args[16]; - memset(args, 0, sizeof(args)); - args[0] = _bootParam; - - _saveLoadFlag = 0; - if (_gameId == GID_MANIAC && _demoMode) - runScript(9, 0, 0, args); - else - runScript(1, 0, 0, args); - } else { - _saveLoadFlag = 0; - } - return 0; } @@ -1395,6 +1379,21 @@ void ScummEngine::setupMusic(int midi) { #pragma mark - int ScummEngine::go() { + // If requested, load a save game instead of running the boot script + if (_saveLoadFlag != 2 || !loadState(_saveLoadSlot, _saveTemporaryState)) { + int args[16]; + memset(args, 0, sizeof(args)); + args[0] = _bootParam; + + _saveLoadFlag = 0; + if (_gameId == GID_MANIAC && _demoMode) + runScript(9, 0, 0, args); + else + runScript(1, 0, 0, args); + } else { + _saveLoadFlag = 0; + } + int delta = 0; int diff = _system->getMillis(); |