Ticket #8158: actor-access.diff

scummvm/scumm/actor.cpp

@@ -1103 +1103 @@
         int i, j;
 
         if (_fullRedraw) {
-                for (j = 0; j < NUM_ACTORS; j++) {
+                for (j = 1; j < NUM_ACTORS; j++) {
                         Actor *a = derefActor(j);
                         if (fg)
                                 a->needRedraw = true;
@@ -1114 +1114 @@
                 for (i = 0; i < gdi._numStrips; i++) {
                         int strip = _screenStartStrip + i;
                         if (testGfxAnyUsageBits(strip)) {
-                                for (j = 0; j < NUM_ACTORS; j++) {
+                                for (j = 1; j < NUM_ACTORS; j++) {
                                         if (testGfxUsageBit(strip, j) && testGfxOtherUsageBits(strip, j)) {
                                                 Actor *a = derefActor(j);
                                                 if (fg)
@@ -1543 +1543 @@
 
         for (i = 0; i < gdi._numStrips; i++) {
                 int strip = _screenStartStrip + i;
-                a = getFirstActor();
-                for (j = 0; j < NUM_ACTORS; j++) {
+                for (j = 1; j < NUM_ACTORS; j++) {
+                        a = derefActor(j);
                         if (testGfxUsageBit(strip, j) && a->top != 0xFF && a->needBgReset) {
                                 clearGfxUsageBit(strip, j);
                                 if ((a->bottom - a->top) >= 0)
                                         gdi.resetBackground(a->top, a->bottom, i);
                         }
-                        a++;
                 }
         }
 
-        for (i = 1, a = getFirstActor(); ++a, i < NUM_ACTORS; i++) {
+        for (i = 1; i < NUM_ACTORS; i++) {
+                a = derefActor(j);
                 a->needBgReset = false;
         }
 }

scummvm/scumm/gfx.cpp

@@ -1820 +1820 @@
                 if (t - _screenStartStrip < camera._leftTrigger || t - _screenStartStrip > camera._rightTrigger)
                         setCameraAt(a->x, 0);
 
-                for (i = 1, a = getFirstActor(); ++a, i < NUM_ACTORS; i++) {
+                for (i = 1; i < NUM_ACTORS; i++) {
+                        a = derefActor(i);
                         if (a->isInCurrentRoom())
                                 a->needRedraw = true;
                 }

scummvm/scumm/script_v6.cpp

@@ -2656 +2656 @@
                 case 6:
                         _fullRedraw = 1;
                         redrawBGAreas();
-                        for (i = 0; i < NUM_ACTORS; i++)
+                        for (i = 1; i < NUM_ACTORS; i++)
                                 derefActor(i)->needRedraw = true;
                         processActors();
                         fadeIn(args[1]);

scummvm/scumm/scumm.h

@@ -620 +620 @@
         /* Should be in Actor class */
         Actor *derefActor(int id);
         Actor *derefActorSafe(int id, const char *errmsg);
-        Actor *getFirstActor() { return _actors; } 
         void showActors();
 
         uint32 *_classData;

scummvm/scumm/scummvm.cpp

@@ -233 +233 @@
         
         // Allocate and Initialize actors
         _actors = new Actor[NUM_ACTORS];
-        for (i = 1, a = getFirstActor(); ++a, i < NUM_ACTORS; i++) {
+        for (i = 1; i < NUM_ACTORS; i++) {
+                a = derefActor(i);
                 a->number = i;
                 a->initActorClass(this);
                 a->initActor(1);
@@ -618 +619 @@
         clearEnqueue();
         stopCycle(0);
 
-        for (i = 1, at = getFirstActor(); ++at, i < NUM_ACTORS; i++) {
+        for (i = 1; i < NUM_ACTORS; i++) {
+                at = derefActor(i);
                 at->hideActor();
         }