[Scummvm-cvs-logs] CVS: scummvm/scumm actor.cpp,1.259,1.260
Max Horn
fingolfin at users.sourceforge.net
Sun Jul 18 16:42:07 CEST 2004
- Previous message: [Scummvm-cvs-logs] CVS: scummvm/scumm script_v6.cpp,1.360,1.361 string.cpp,1.225,1.226
- Next message: [Scummvm-cvs-logs] CVS: scummvm/scumm dialogs.cpp,1.103.2.3,1.103.2.4 saveload.cpp,1.140.2.7,1.140.2.8 script_v8.cpp,2.229.2.6,2.229.2.7 scummvm.cpp,2.577.2.25,2.577.2.26
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Update of /cvsroot/scummvm/scummvm/scumm
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv19756
Modified Files:
actor.cpp
Log Message:
Hack to work around bug #775097 - probably wrong, probably will cause regressions, probably should be undone soon -- but it's an experiment ;-)
Index: actor.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/actor.cpp,v
retrieving revision 1.259
retrieving revision 1.260
diff -u -d -r1.259 -r1.260
--- actor.cpp 18 Jul 2004 09:53:58 -0000 1.259
+++ actor.cpp 18 Jul 2004 23:41:49 -0000 1.260
@@ -895,6 +895,17 @@
if (diff > 0)
return +1;
+ // FIXME: This hack works around bug #775097. It's probably wrong, though :-/
+ // Would be interesting if somebody could check the disassembly (see also the
+ // comment on the above mentioned tracker item).
+ if (g_scumm->_gameId == GID_TENTACLE) {
+ diff = actor1->forceClip - actor2->forceClip;
+ if (diff < 0)
+ return -1;
+ if (diff > 0)
+ return +1;
+ }
+
// The qsort() function is not guaranteed to be stable (i.e. it may
// re-order "equal" elements in an array it sorts). Hence we use the
// actor number as tie-breaker. This is needed for the Sam & Max intro,
- Previous message: [Scummvm-cvs-logs] CVS: scummvm/scumm script_v6.cpp,1.360,1.361 string.cpp,1.225,1.226
- Next message: [Scummvm-cvs-logs] CVS: scummvm/scumm dialogs.cpp,1.103.2.3,1.103.2.4 saveload.cpp,1.140.2.7,1.140.2.8 script_v8.cpp,2.229.2.6,2.229.2.7 scummvm.cpp,2.577.2.25,2.577.2.26
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the Scummvm-git-logs
mailing list