Ticket #2690: flashlight.diff

engines/scumm/intern.h

@@ -88 +88 @@
         void redefineBuiltinCursorFromChar(int index, int chr);
         void redefineBuiltinCursorHotspot(int index, int x, int y);
 
+        virtual void clearFlashlight();
         void drawFlashlight();
 
         /* Version 5 script opcodes */

engines/scumm/gfx.cpp

@@ -253 +253 @@
         int i;
         int adj = 0;
 
+        clearFlashlight();
+
         for (i = 0; i < 3; i++) {
                 res.nukeResource(rtBuffer, i + 1);
                 res.nukeResource(rtBuffer, i + 5);
@@ -1089 +1091 @@
         }
 }
 
+void ScummEngine_v5::clearFlashlight() {
+        _flashlight.isDrawn = false;
+        _flashlight.buffer = NULL;
+}
+
 void ScummEngine_v5::drawFlashlight() {
         int i, j, x, y;
         VirtScreen *vs = &virtscr[kMainVirtScreen];

engines/scumm/scumm.h

@@ -496 +496 @@
         virtual void animateCursor() {}
         virtual void updatePalette();
 
+        virtual void clearFlashlight() {}
+
         /**
          * Flag which signals that the SMUSH video playback should end now
          * (e.g. because it was aborted by the user or it's simply finished).