Ticket #2064: samnmax_1220168.diff

scumm/actor.cpp

@@ -959 +959 @@
         // wouldn't yield a useful gain anyway.
         // In particular, changing this loop caused a number of bugs in the past,
         // including bugs #758167, #775097, and #1093867.
-        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]);
+        if (_gameId == GID_SAMNMAX) {
+                for (int j = 0; j < numactors; ++j) {
+                        for (int i = 0; i < numactors; ++i) {
+                                int actor1_y = _sortedActors[j]->_pos.y;
+                                int actor2_y = _sortedActors[i]->_pos.y;
+                                if (actor1_y < actor2_y) {
+                                        SWAP(_sortedActors[i], _sortedActors[j]);
+                                } else if (actor1_y == actor2_y) {
+                                        if ((j > i && _sortedActors[j] < _sortedActors[i]) || (j < i && _sortedActors[j] > _sortedActors[i])) {
+                                                SWAP(_sortedActors[i], _sortedActors[j]);
+                                        }
+                                }
+                        }
+                }
+        } else {
+                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]);
+                                }
                         }
                 }
         }