libretro/scummvm
1
0
Fork 0
mirror of https://github.com/libretro/scummvm.git synced 2025-04-02 14:51:40 +00:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Merge pull request #902 from segrax/Fix_4556

Browse Source 
SCUMM: Fix bug #4556 (Maniac: Purple Tentacle appears in Lab after being chased out)
This commit is contained in:
Eugene Sandulenko 2017-02-21 23:33:17 +01:00 committed by GitHub
commit 085332a3dc
1 changed files with 19 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
engines/scumm/script_v2.cpp
View File

@ -1188,6 +1188,25 @@ void ScummEngine_v2::o2_startScript() {
}
}
// WORKAROUND bug #4556: Purple Tentacle can appear in the lab, after being
// chased out and end up stuck in the room. This bug is triggered if the player
// enters the lab within 45 minutes of first entering the mansion and has chased Purple Tentacle
// out. Eventually the cutscene with Purple Tentacle chasing Sandy in the lab
// will play. This script leaves Purple Tentacle in the room causing him to become
// a permanent resident.
// Our fix is simply to prevent the Cutscene playing, if the lab has already been stormed
if (_game.id == GID_MANIAC) {
if (_game.version >= 1 && script == 155) {
if (VAR(120) == 1)
return;
}
// Script numbers are different in V0
if (_game.version == 0 && script == 150) {
if (VAR(104) == 1)
return;
}
}
runScript(script, 0, 0, 0);
}