Ticket #1055: actor-draw-order.patch

File actor-draw-order.patch, 969 bytes (added by fingolfin, 16 years ago)
  • scumm/actor.cpp

    RCS file: /cvsroot/scummvm/scummvm/scumm/actor.cpp,v
    retrieving revision 1.319
    diff -u -d -r1.319 actor.cpp
     
    924924        if (diff > 0)
    925925                return +1;
    926926
    927         // FIXME: This hack works around bug #775097. It's probably wrong, though :-/
    928         // Would be interesting if somebody could check the disassembly (see also the
    929         // comment on the above mentioned tracker item).
    930         if (g_scumm->_gameId == GID_TENTACLE) {
    931                 diff = actor1->forceClip - actor2->forceClip;
    932                 if (diff < 0)
    933                         return -1;
    934                 if (diff > 0)
    935                         return +1;
     927        // FIXME: This hack works around bugs #775097 and #1093867.
     928        if (g_scumm->_gameId == GID_TENTACLE || g_scumm->_gameId == GID_FT) {
     929                return actor2->number - actor1->number;
    936930        }
    937931
    938932        // The qsort() function is not guaranteed to be stable (i.e. it may