diff options
author | James Brown | 2002-08-20 10:08:48 +0000 |
---|---|---|
committer | James Brown | 2002-08-20 10:08:48 +0000 |
commit | c168e3b31e5f74a2da1d94dffebf59feebc83c69 (patch) | |
tree | 681e935e3d6937bcb700f853c36160a474c77214 | |
parent | ca4789c2ffff32213aaf90f656524f44f83d5830 (diff) | |
download | scummvm-rg350-c168e3b31e5f74a2da1d94dffebf59feebc83c69.tar.gz scummvm-rg350-c168e3b31e5f74a2da1d94dffebf59feebc83c69.tar.bz2 scummvm-rg350-c168e3b31e5f74a2da1d94dffebf59feebc83c69.zip |
Re-add MI2 fixme
svn-id: r4780
-rw-r--r-- | script_v1.cpp | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/script_v1.cpp b/script_v1.cpp index c056de812d..333b35120c 100644 --- a/script_v1.cpp +++ b/script_v1.cpp @@ -1345,6 +1345,10 @@ void Scumm::o5_getDist() o2 = getVarOrDirectWord(0x40); r = getObjActToObjActDist(o1, o2); + /* FIXME: MI2 race workaround, see bug 597022 */ + if (_gameId == GID_MONKEY2 && vm.slot[_currentScript].number == 40 && r < 60) + r = 60; + setResult(r); } |