diff options
| author | Max Horn | 2006-11-07 21:14:15 +0000 |
|---|---|---|
| committer | Max Horn | 2006-11-07 21:14:15 +0000 |
| commit | c1e16d61682f0489d8bf695cc59daf0dec07e19e (patch) | |
| tree | bbef5c662da5a1eb342de494d6a8338c7911161e /engines | |
| parent | 98e7abcbfcbac8403e9b867b37996e642de16a85 (diff) | |
| download | scummvm-rg350-c1e16d61682f0489d8bf695cc59daf0dec07e19e.tar.gz scummvm-rg350-c1e16d61682f0489d8bf695cc59daf0dec07e19e.tar.bz2 scummvm-rg350-c1e16d61682f0489d8bf695cc59daf0dec07e19e.zip | |
Disabled an undocumented workaround for a supposed bug in FOA
svn-id: r24652
Diffstat (limited to 'engines')
| -rw-r--r-- | engines/scumm/script_v5.cpp | 19 |
1 files changed, 14 insertions, 5 deletions
diff --git a/engines/scumm/script_v5.cpp b/engines/scumm/script_v5.cpp index 5db60d1180..3b75354a4c 100644 --- a/engines/scumm/script_v5.cpp +++ b/engines/scumm/script_v5.cpp @@ -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 |