thirdparty/scummvm
2
0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

SCUMM: Remove old getDist() MI2 workaround for Trac#420

Browse source 
This one was added more than 20 years ago, but I can't reproduce the
issue anymore with the DOS, Macintosh, or Amiga versions, and it
appears that it was already OK back in 2008.

I couldn't reproduce any lock-up with the original DOS version in
DOSBox either.
This commit is contained in:
Donovan Watteau 2022-06-17 23:09:16 +02:00 • committed by Andrea Boscarino
parent 4ff9960ac9
commit ea0f0cc9ee
1 changed files with 0 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

5
engines/scumm/script_v5.cpp
View file

@ -1417,11 +1417,6 @@ void ScummEngine_v5::o5_getDist() {
else else
r = getObjActToObjActDist(o1, o2); r = getObjActToObjActDist(o1, o2);
// FIXME: MI2 race workaround, see bug #420. We never quite figured out
// what the real cause of this, or if it maybe occurs in the original, too...
if (_game.id == GID_MONKEY2 && vm.slot[_currentScript].number == 40 && r < 60)
r = 60;
setResult(r); setResult(r);
} }