[Scummvm-cvs-logs] CVS: scummvm/scumm script_v6.cpp,1.458,1.459
Max Horn
fingolfin at users.sourceforge.net
Tue Jan 17 10:58:03 CET 2006
Update of /cvsroot/scummvm/scummvm/scumm
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv4089
Modified Files:
script_v6.cpp
Log Message:
Updated comments
Index: script_v6.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/script_v6.cpp,v
retrieving revision 1.458
retrieving revision 1.459
diff -u -d -r1.458 -r1.459
--- script_v6.cpp 16 Jan 2006 09:20:27 -0000 1.458
+++ script_v6.cpp 17 Jan 2006 18:57:26 -0000 1.459
@@ -1185,9 +1185,8 @@
} else {
a2 = derefActorSafe(obj, "o6_walkActorToObj(2)");
if (_gameId == GID_SAMNMAX && a2 == 0) {
- // FIXME: This is a hack to work around bug #742676 SAM: Fish Farm.
- // Note quite sure why it happens, though, if it's normal or due to
- // a bug in the ScummVM code.
+ // WORKAROUND bug #742676 SAM: Fish Farm. Note quite sure why it
+ // happens, whether it's normal or due to a bug in the ScummVM code.
debug(0, "o6_walkActorToObj: invalid actor %d", obj);
return;
}
@@ -1267,9 +1266,9 @@
int act = pop();
if (_gameId == GID_TENTACLE && _roomResource == 57 &&
vm.slot[_currentScript].number == 19 && act == 593) {
- // FIXME: This very odd case (animateActor(593,250)) occurs in DOTT, in the
- // cutscene after George cuts down the "cherry tree" and the tree Laverne
- // is trapped in vanishes... see bug #743363.
+ // WORKAROUND bug #743363: This very odd case (animateActor(593,250))
+ // occurs in DOTT, in the cutscene after George cuts down the "cherry
+ // tree" and the tree Laverne is trapped in vanishes...
// Not sure if this means animateActor somehow also must work for objects
// (593 is the time machine in room 57), or if this is simply a script bug.
act = 6;
@@ -1321,7 +1320,7 @@
putState(obj, 1);
markObjectRectAsDirty(obj);
clearDrawObjectQueue();
- runInventoryScript(obj); /* Difference */
+ runInventoryScript(obj);
}
void ScummEngine_v6::o6_loadRoomWithEgo() {
@@ -3048,7 +3047,8 @@
}
void ScummEngine_v6::o6_getPixel() {
- // this opcode check ground area in minigame "Asteroid Lander" in the dig
+ // This opcode is used to check fir ground area in the "Asteroid Lander"
+ // minigame in "The Dig"
int x, y;
if (_heversion == 61) {
More information about the Scummvm-git-logs
mailing list