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

Disabled an undocumented workaround for a supposed bug in FOA

Browse Source 
svn-id: r24652
This commit is contained in:
Max Horn 2006-11-07 21:14:15 +00:00
parent 98e7abcbfc
commit c1e16d6168
1 changed files with 14 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
engines/scumm/script_v5.cpp
View File

@ -2575,11 +2575,6 @@ void ScummEngine_v5::o5_walkActorToActor() {
int nr2 = getVarOrDirectByte(PARAM_2);
int dist = fetchScriptByte();
if (nr == 106 && _game.id == GID_INDY4) {
printf("Bypassing Indy4 bug\n");
return;
}
if (_game.id == GID_LOOM && _game.version == 4 && nr == 1 && nr2 == 0 &&
dist == 255 && vm.slot[_currentScript].number == 98) {
// WORKAROUND bug #743615: LoomCD script 98 contains this:
@ -2589,6 +2584,20 @@ void ScummEngine_v5::o5_walkActorToActor() {
return;
}
/*
FIXME: Disabled this undocumented workaround (which has been there since the
very first revision of this code). It's likely related to the following workaround;
if so, they should be merged. As it is, undocumented workarounds are bad and
thus I disabled this. If anybody gets troubles due to this, we will be able to
implement a proper fix.
if (nr == 106 && _game.id == GID_INDY4) {
printf("Bypassing Indy4 bug\n");
return;
}
*/
if (_game.id == GID_INDY4 && nr == 1 && nr2 == 106 &&
dist == 255 && vm.slot[_currentScript].number == 210) {
// WORKAROUND bug: Work around an invalid actor bug when using the