Ticket #2690: flashlight_v2.diff

engines/scumm/intern.h

@@ -59 +59 @@
 public:
         ScummEngine_v5(OSystem *syst, const DetectorResult &dr);
 
+        void clearFlashlight();
 protected:
         virtual void setupOpcodes();
         virtual void executeOpcode(byte i);

engines/scumm/gfx.cpp

@@ -789 +789 @@
                         val = +1;
                         redrawBGStrip(0, 1);
                 } else if (_fullRedraw || diff != 0) {
+                        if (_game.version <= 5) {
+                                ((ScummEngine_v5 *)this)->clearFlashlight();
+                        }
                         _bgNeedsRedraw = false;
                         redrawBGStrip(0, gdi._numStrips);
                 }
@@ -1089 +1092 @@
         }
 }
 
+void ScummEngine_v5::clearFlashlight() {
+        _flashlight.isDrawn = false;
+        _flashlight.buffer = NULL;
+}
+
 void ScummEngine_v5::drawFlashlight() {
         int i, j, x, y;
         VirtScreen *vs = &virtscr[kMainVirtScreen];