diff options
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; |