[Scummvm-cvs-logs] CVS: scummvm/scumm actor.cpp,1.401,1.402 script_v2.cpp,2.287,2.288 script_v5.cpp,1.305,1.306
Max Horn
fingolfin at users.sourceforge.net
Sun Jan 22 12:48:00 CET 2006
Update of /cvsroot/scummvm/scummvm/scumm
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv19785
Modified Files:
actor.cpp script_v2.cpp script_v5.cpp
Log Message:
Modified some workaround comments
Index: actor.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/actor.cpp,v
retrieving revision 1.401
retrieving revision 1.402
diff -u -d -r1.401 -r1.402
--- actor.cpp 18 Jan 2006 17:39:39 -0000 1.401
+++ actor.cpp 22 Jan 2006 20:46:48 -0000 1.402
@@ -1397,7 +1397,7 @@
} 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?
Index: script_v2.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/script_v2.cpp,v
retrieving revision 2.287
retrieving revision 2.288
diff -u -d -r2.287 -r2.288
--- script_v2.cpp 18 Jan 2006 17:39:46 -0000 2.287
+++ script_v2.cpp 22 Jan 2006 20:46:50 -0000 2.288
@@ -1121,7 +1121,7 @@
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);
}
Index: script_v5.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/script_v5.cpp,v
retrieving revision 1.305
retrieving revision 1.306
diff -u -d -r1.305 -r1.306
--- script_v5.cpp 18 Jan 2006 17:39:46 -0000 1.305
+++ script_v5.cpp 22 Jan 2006 20:46:51 -0000 1.306
@@ -1236,11 +1236,12 @@
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;
More information about the Scummvm-git-logs
mailing list