aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--scumm/actor.cpp2
-rw-r--r--scumm/script_v2.cpp2
-rw-r--r--scumm/script_v5.cpp5
3 files changed, 5 insertions, 4 deletions
diff --git a/scumm/actor.cpp b/scumm/actor.cpp
index 80fdf31087..381a4ebad2 100644
--- a/scumm/actor.cpp
+++ b/scumm/actor.cpp
@@ -1397,7 +1397,7 @@ void ScummEngine::actorTalk(const byte *msg) {
} else {
int oldact;
- // FIXME: Workaround for bug #770724
+ // WORKAROUND bug #770724
if (_gameId == GID_LOOM && _roomResource == 23 &&
vm.slot[_currentScript].number == 232 && _actorToPrintStrFor == 0) {
_actorToPrintStrFor = 2; // Could be anything from 2 to 5. Maybe compare to original?
diff --git a/scumm/script_v2.cpp b/scumm/script_v2.cpp
index 45fd167f6f..33829da22e 100644
--- a/scumm/script_v2.cpp
+++ b/scumm/script_v2.cpp
@@ -1121,7 +1121,7 @@ void ScummEngine_v2::o2_walkActorTo() {
int act = getVarOrDirectByte(PARAM_1);
- // FIXME: Work around for bug #1252606
+ // WORKAROUND bug #1252606
if (_gameId == GID_ZAK && _version == 1 && vm.slot[_currentScript].number == 115 && act == 249) {
act = VAR(VAR_EGO);
}
diff --git a/scumm/script_v5.cpp b/scumm/script_v5.cpp
index fdbac7e0ea..f6ce0b7d70 100644
--- a/scumm/script_v5.cpp
+++ b/scumm/script_v5.cpp
@@ -1236,11 +1236,12 @@ void ScummEngine_v5::o5_getDist() {
o2 = getVarOrDirectWord(PARAM_2);
r = getObjActToObjActDist(o1, o2);
- // FIXME: MI2 race workaround, see bug #597022
+ // FIXME: MI2 race workaround, see bug #597022. We never quite figured out
+ // what the real cause of this, or if it maybe occurs in the original, too...
if (_gameId == GID_MONKEY2 && vm.slot[_currentScript].number == 40 && r < 60)
r = 60;
- // FIXME: Workaround for bug #795937
+ // WORKAROUND bug #795937
if ((_gameId == GID_MONKEY_EGA || _gameId == GID_PASS) && o1 == 1 && o2 == 307 && vm.slot[_currentScript].number == 205 && r == 2)
r = 3;