Ticket #8026: loomlight2.diff

scummvm/scumm/actor.cpp

@@ -966 +966 @@
         }
 }
 
-void Scumm::setActorRedrawFlags()
+void Scumm::setActorRedrawFlags(bool fg, bool bg)
 {
         int i, j;
         uint32 bits;
@@ -974 +974 @@
         if (_fullRedraw) {
                 for (j = 0; j < NUM_ACTORS; j++) {
                         Actor *a = derefActor(j);
-                        a->needRedraw = true;
-                        a->needBgReset = true;
+                        if (fg)
+                                a->needRedraw = true;
+                        if (bg)
+                                a->needBgReset = true;
                 }
         } else {
                 for (i = 0; i < 40; i++) {
@@ -984 +986 @@
                                 for (j = 0; j < NUM_ACTORS; j++) {
                                         if ((bits & (1 << j)) && bits != (uint32)(1 << j)) {
                                                 Actor *a = derefActor(j);
-                                                a->needRedraw = true;
-                                                a->needBgReset = true;
+                                                if (fg)
+                                                        a->needRedraw = true;
+                                                if (bg)
+                                                        a->needBgReset = true;
                                         }
                                 }
                         }

scummvm/scumm/scumm.h

@@ -704 +704 @@
 
         void walkActors();
         void playActorSounds();
-        void setActorRedrawFlags();
+        void setActorRedrawFlags(bool fg, bool bg);
         void resetActorBgs();
         void processActors();
         int getActorFromPos(int x, int y);

scummvm/scumm/scummvm.cpp

@@ -443 +443 @@
                 }
 
                 processDrawQue();
-                setActorRedrawFlags();
+                setActorRedrawFlags(true, true);
                 resetActorBgs();
 
                 if (!(_vars[VAR_CURRENT_LIGHTS] & LIGHTMODE_screen) &&
                       _vars[VAR_CURRENT_LIGHTS] & LIGHTMODE_flashlight) {
                         drawFlashlight();
-                        setActorRedrawFlags();
+                        setActorRedrawFlags(true, false);
                 }
 
                 processActors();