From ea0f0cc9ee1e089c94e1ce9fee6a587920e3147f Mon Sep 17 00:00:00 2001 From: Donovan Watteau Date: Fri, 17 Jun 2022 23:09:16 +0200 Subject: [PATCH] SCUMM: Remove old getDist() MI2 workaround for Trac#420 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. --- engines/scumm/script_v5.cpp | 5 ----- 1 file changed, 5 deletions(-) diff --git a/engines/scumm/script_v5.cpp b/engines/scumm/script_v5.cpp index 443dc36130c..5a0ef0eadc7 100644 --- a/engines/scumm/script_v5.cpp +++ b/engines/scumm/script_v5.cpp @@ -1417,11 +1417,6 @@ void ScummEngine_v5::o5_getDist() { else 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); }