diff options
| author | Travis Howell | 2004-02-23 11:15:03 +0000 |
|---|---|---|
| committer | Travis Howell | 2004-02-23 11:15:03 +0000 |
| commit | b2f6ed6f235a27ff127ba7e98c859946ebaa1831 (patch) | |
| tree | 422a802d21afc5d418028230c529b7c5c00022d0 /scumm | |
| parent | 8b0bfb620627ddda1a4b9295340c18777f73dc91 (diff) | |
| download | scummvm-rg350-b2f6ed6f235a27ff127ba7e98c859946ebaa1831.tar.gz scummvm-rg350-b2f6ed6f235a27ff127ba7e98c859946ebaa1831.tar.bz2 scummvm-rg350-b2f6ed6f235a27ff127ba7e98c859946ebaa1831.zip | |
Add back hack
svn-id: r13007
Diffstat (limited to 'scumm')
| -rw-r--r-- | scumm/script_v2.cpp | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/scumm/script_v2.cpp b/scumm/script_v2.cpp index 26264e9d45..f17fcc0239 100644 --- a/scumm/script_v2.cpp +++ b/scumm/script_v2.cpp @@ -1119,6 +1119,14 @@ void ScummEngine_v2::o2_stopScript() { script = getVarOrDirectByte(PARAM_1); + if ((_gameId == GID_ZAK) && (_roomResource == 7) && (vm.slot[_currentScript].number == 10001)) { + // FIXME: Nasty hack for bug #771499 + // Don't let the exit script for room 7 stop the buy script (24), + // switching to the number selection keypad (script 15) + if ((script == 24) && isScriptRunning(15)) + return; + } + if (script == 0) script = vm.slot[_currentScript].number; |