libretro/scummvm
1
0
Fork 0
mirror of https://github.com/libretro/scummvm.git synced 2024-12-05 00:36:57 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #903 from segrax/Fix_4112

Browse Source 
SCUMM: Fix bug #4112 (MANIAC: Power never returns)
This commit is contained in:
Eugene Sandulenko 2017-02-21 23:32:10 +01:00 committed by GitHub
commit b44b297a84
1 changed files with 24 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
engines/scumm/script_v2.cpp
View File

@ -31,6 +31,10 @@
namespace Scumm {
// Helper functions for ManiacMansion workarounds
#define MM_SCRIPT(script) (script + (_game.version == 0 ? 0 : 5))
#define MM_VALUE(v0,v1) (_game.version == 0 ? v0 : v1)
#define OPCODE(i, x) _opcodes[i]._OPCODE(ScummEngine_v2, x)
void ScummEngine_v2::setupOpcodes() {
@ -1178,13 +1182,8 @@ void ScummEngine_v2::o2_startScript() {
// (which makes Ted go answer the door bell) is simply ignored. This
// way, the door bell still chimes, but Ted ignores it.
if (_game.id == GID_MANIAC) {
if (_game.version >= 1 && script == 87) {
if (isScriptRunning(88) || isScriptRunning(89))
return;
}
// Script numbers are different in V0
if (_game.version == 0 && script == 82) {
if (isScriptRunning(83) || isScriptRunning(84))
if (script == MM_SCRIPT(82)) {
if (isScriptRunning(MM_SCRIPT(83)) || isScriptRunning(MM_SCRIPT(84)))
return;
}
}
@ -1193,14 +1192,28 @@ void ScummEngine_v2::o2_startScript() {
}
void ScummEngine_v2::stopScriptCommon(int script) {
// WORKAROUND bug #4112: If you enter the lab while Dr. Fred has the powered turned off
// to repair the Zom-B-Matic, the script will be stopped and the power will never turn
// back on. This fix forces the power on, when the player enters the lab,
// if the script which turned it off is running
if (_game.id == GID_MANIAC && _roomResource == 4 && isScriptRunning(MM_SCRIPT(138))) {
if (vm.slot[_currentScript].number == MM_VALUE(130, 163)) {
if (script == MM_SCRIPT(138)) {
int obj = MM_VALUE(124, 157);
putState(obj, getState(obj) & ~kObjectState_08);
}
}
}
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 (_game.version >= 1 && script == 116 && isScriptRunning(89))
return;
// Script numbers are different in V0
if (_game.version == 0 && script == 111 && isScriptRunning(84))
if (script == MM_SCRIPT(111) && isScriptRunning(MM_SCRIPT(84)))
return;
}