Ticket #8175: cmi-verb-coin.diff

scummvm/scumm/actor.cpp

@@ -868 +868 @@
         // Make a list of all actors in this room
         for (i = 1; i < NUM_ACTORS; i++) {
                 a = derefActor(i);
+                if ((_features & GF_AFTER_V8) && a->layer < 0)
+                        continue;
                 if (a->isInCurrentRoom())
                         actors[numactors++] = a;
         }
@@ -903 +905 @@
         delete [] actors;
 }
 
+// Used in Scumm v8, to allow the verb coin to be drawn over the inventory
+// chest. I'm assuming that draw order won't matter here.
+void Scumm::processUpperActors()
+{
+        Actor *a;
+        int i;
+
+        for (i = 1; i < NUM_ACTORS; i++) {
+                a = derefActor(i);
+                if (a->isInCurrentRoom() && a->costume && a->layer < 0) {
+                        CHECK_HEAP getMaskFromBox(a->walkbox);
+                        a->drawActorCostume();
+                        CHECK_HEAP a->animateCostume();
+                }
+        }
+}
+
 void Actor::drawActorCostume()
 {
         if (!needRedraw)

scummvm/scumm/scumm.h

@@ -673 +673 @@
         void setActorRedrawFlags(bool fg, bool bg);
         void resetActorBgs();
         void processActors();
+        void processUpperActors();
         int getActorFromPos(int x, int y);
         void actorFollowCamera(int act);
         

scummvm/scumm/scummvm.cpp

@@ -562 +562 @@
                 }
 
                 drawBlastObjects();
+                if (_features & GF_AFTER_V8)
+                        processUpperActors();
                 drawBlastTexts();
                 drawDirtyScreenParts();
                 removeBlastObjects();