diff options
| author | Max Horn | 2003-05-08 14:32:25 +0000 |
|---|---|---|
| committer | Max Horn | 2003-05-08 14:32:25 +0000 |
| commit | 6ab104cc3ca433b672318b3e9bde26f7e882940c (patch) | |
| tree | a588ee2fe7eb8d8a6d7243bb557e7ae9b35d564a | |
| parent | 07bbeb31e962aa8ab8c69683fccd14e21f7f38f3 (diff) | |
| download | scummvm-rg350-6ab104cc3ca433b672318b3e9bde26f7e882940c.tar.gz scummvm-rg350-6ab104cc3ca433b672318b3e9bde26f7e882940c.tar.bz2 scummvm-rg350-6ab104cc3ca433b672318b3e9bde26f7e882940c.zip | |
some V2 fixes (we really really need to revise the _vars handling!)
svn-id: r7392
| -rw-r--r-- | scumm/script.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/scumm/script.cpp b/scumm/script.cpp index 4ff48ffca8..b1ccf99b43 100644 --- a/scumm/script.cpp +++ b/scumm/script.cpp @@ -653,7 +653,7 @@ void Scumm::runAllScripts() { } void Scumm::runExitScript() { - if (_vars[VAR_EXIT_SCRIPT]) + if (!(_features & GF_AFTER_V2) && _vars[VAR_EXIT_SCRIPT]) runScript(_vars[VAR_EXIT_SCRIPT], 0, 0, 0); if (_EXCD_offs) { int slot = getScriptSlot(); @@ -684,12 +684,12 @@ void Scumm::runExitScript() { runScriptNested(slot); } - if (_vars[VAR_EXIT_SCRIPT2]) + if (!(_features & GF_AFTER_V2) && _vars[VAR_EXIT_SCRIPT2]) runScript(_vars[VAR_EXIT_SCRIPT2], 0, 0, 0); } void Scumm::runEntryScript() { - if (_vars[VAR_ENTRY_SCRIPT]) + if (!(_features & GF_AFTER_V2) && _vars[VAR_ENTRY_SCRIPT]) runScript(_vars[VAR_ENTRY_SCRIPT], 0, 0, 0); if (_ENCD_offs) { int slot = getScriptSlot(); @@ -703,7 +703,7 @@ void Scumm::runEntryScript() { vm.slot[slot].delayFrameCount = 0; runScriptNested(slot); } - if (_vars[VAR_ENTRY_SCRIPT2]) + if (!(_features & GF_AFTER_V2) && _vars[VAR_ENTRY_SCRIPT2]) runScript(_vars[VAR_ENTRY_SCRIPT2], 0, 0, 0); } |