Ticket #1864: ft_1093867.diff

scumm/actor.cpp

@@ -981 +981 @@
         for (int i = 1; i < _numActors; i++) {
                 if (_version == 8 && _actors[i]._layer < 0)
                         continue;
-                if (_actors[i].isInCurrentRoom() && _actors[i]._costume)
+                if (_actors[i].isInCurrentRoom()) {
                         _sortedActors[numactors++] = &_actors[i];
+                }
         }
         if (!numactors) {
                 return;
@@ -990 +991 @@
 
         // Sort actors by position before we draw them (to ensure that actors in
         // front are drawn after those "behind" them).
-        qsort(_sortedActors, numactors, sizeof (Actor*), compareDrawOrder);
-
-        Actor** end = _sortedActors + numactors;
+        for (int j = 0; j < numactors; ++j) {
+                for (int i = 0; i < numactors; ++i) {
+                        int sc_actor1 = _sortedActors[j]->_pos.y - _sortedActors[j]->_layer * 2000;
+                        int sc_actor2 = _sortedActors[i]->_pos.y - _sortedActors[i]->_layer * 2000;
+                        if (sc_actor1 < sc_actor2) {
+                                SWAP(_sortedActors[i], _sortedActors[j]);
+                        }
+                }
+        }
 
         // Finally draw the now sorted actors
+        Actor** end = _sortedActors + numactors;
         for (Actor** ac = _sortedActors; ac != end; ++ac) {
                 Actor* a = *ac;
-                CHECK_HEAP
-                a->drawActorCostume();
-                CHECK_HEAP
-                a->animateCostume();
+                if (a->_costume) {
+                        a->drawActorCostume();
+                        a->animateCostume();
+                }
         }
         
         if (_features & GF_NEW_COSTUMES)