aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTravis Howell2006-03-04 04:46:15 +0000
committerTravis Howell2006-03-04 04:46:15 +0000
commit28b6c9250303da10ca4a764cc25b5a885db4ac6d (patch)
treea1308ee0f0f2164f2b7f0e3dd4b8a78b9073ef73
parent2cf16b0d14846840dd9b69f2ce979240833e37ae (diff)
downloadscummvm-rg350-28b6c9250303da10ca4a764cc25b5a885db4ac6d.tar.gz
scummvm-rg350-28b6c9250303da10ca4a764cc25b5a885db4ac6d.tar.bz2
scummvm-rg350-28b6c9250303da10ca4a764cc25b5a885db4ac6d.zip
Update hack for bug #915575 - MANIAC: Disappearing New Kid verb
svn-id: r21058
-rw-r--r--engines/scumm/script_v2.cpp20
1 files changed, 10 insertions, 10 deletions
diff --git a/engines/scumm/script_v2.cpp b/engines/scumm/script_v2.cpp
index d13b045ed8..ff32ab033a 100644
--- a/engines/scumm/script_v2.cpp
+++ b/engines/scumm/script_v2.cpp
@@ -453,14 +453,6 @@ void ScummEngine_v2::writeVar(uint var, int value) {
}
_scummVars[var] = value;
-
- // HACK: Ender's hack around a bug in Maniac. If you take the last dime from
- // Weird Ed's piggybank, this disables the New Kid option and runs the Jail
- // cutscene. Script 116 sets var[175] to 1, which disables New Kid in
- // script 164. Unfortunatly, when New Kid is reenabled (var[175] = 0) in
- // script 89, script 164 isn't reran to redraw it. Why? Dunno. Hack? Yes.
- if ((var == 175) && (_game.id == GID_MANIAC) && (vm.slot[_currentScript].number == 89))
- runScript(164, 0, 0, 0);
}
void ScummEngine_v2::getResultPosIndirect() {
@@ -1167,14 +1159,22 @@ void ScummEngine_v2::o2_stopScript() {
script = getVarOrDirectByte(PARAM_1);
- if ((_game.id == GID_ZAK) && (_roomResource == 7) && (vm.slot[_currentScript].number == 10001)) {
+ if (_game.id == 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),
+ // Don't let the exit script for room 7 stop the buy script (24), when
// switching to the number selection keypad (script 15)
if ((script == 24) && isScriptRunning(15))
return;
}
+ if (_game.id == GID_MANIAC && _roomResource == 26 && vm.slot[_currentScript].number == 10001) {
+ // FIXME: Nasty hack for bug #915575
+ // Don't let the exit script for room 26 stop the script (116), when
+ // switching to the dungeon (script 89)
+ if ((script == 116) && isScriptRunning(89))
+ return;
+ }
+
if (script == 0)
script = vm.slot[_currentScript].number;