1 files changed, 19 insertions, 43 deletions
diff --git a/engines/lab/readdiff.cpp b/engines/lab/readdiff.cpp
index ebf3d0793f..d220b3edc8 100644
--- a/engines/lab/readdiff.cpp
+++ b/engines/lab/readdiff.cpp
@@ -37,38 +37,23 @@
 
 namespace Lab {
 
-extern BitMap *DispBitMap, *DrawBitMap;
-extern uint32 VGABytesPerPage;
-
-extern byte **startoffile;
-
 static bool PlayOnce = false, changedscreen;
+static uint32 header, size, processed = 0L, WaitSec = 0L, WaitMicros = 0L, DelayMicros = 0L;
+static uint16 CurBit = 0, framenumber = 0, samplespeed, numchunks = 1;
+static byte *Buffer, temp[5];
+static bool FirstThru = true, donepal = false;
+static byte *storagefordifffile, **difffile = &storagefordifffile;
+static byte *start;
+static uint32 diffwidth, diffheight;
+static byte blackbuffer[256 * 3];
+static byte *mstart;
 
-bool NoFlip         = false,  /* Don't flip the new picture to front  */
-     DoBlack        = false,     /* Black the screen before new picture  */
+bool DoBlack        = false,     /* Black the screen before new picture  */
      nopalchange    = false,     /* Don't change the palette.            */
      IsBM           = false,     /* Just fill in the RawDIFFBM structure */
-     hidemouse      = false,     /* Don't set the mouse colors           */
      stopsound      = false,
-     soundplaying   = false,
-     screenbuffer   = false,
-     waitForEffect     = false, /* Wait for each sound effect to finish
-                                                                                                      before coninuing.                    */
-                      mwaitForEffect    = false;
-
-uint16 DataBytesPerRow;
-
-#define CONTINUOUS      0xFFFF
-
-DIFFHeader headerdata;
-
-
-
-/*------ Stuff for the animation task. -----*/
-
-static byte *start;
-
-static uint32 diffwidth, diffheight;
+     waitForEffect  = false;     /* Wait for each sound effect to finish
+                                   before coninuing.                    */
 
 static bool continuous,
 	IsPlaying      = false,
@@ -77,11 +62,16 @@ static bool continuous,
 	IsAnim         = false,
 	IsPal          = false;
 
-char diffcmap[256 * 3], lastcmap[256 * 3];
-
+uint16 DataBytesPerRow;
+DIFFHeader headerdata;
+char diffcmap[256 * 3];
 BitMap RawDiffBM;
 
+extern BitMap *DispBitMap, *DrawBitMap;
+extern uint32 VGABytesPerPage;
+extern byte **startoffile;
 
+#define CONTINUOUS      0xFFFF
 
 
 /*****************************************************************************/
@@ -101,8 +91,6 @@ void unDiff(byte *NewBuf, byte *OldBuf, byte *DiffData, uint16 bytesperrow, bool
 }
 
 
-static byte blackbuffer[256 * 3];
-
 /*****************************************************************************/
 /* Changes the front screen to black.                                        */
 /*****************************************************************************/
@@ -132,14 +120,6 @@ void blackAllScreen() {
 }
 
 
-
-/* For Play Diff */
-static uint32 header, size, processed = 0L, WaitSec    = 0L, WaitMicros = 0L, DelayMicros = 0L;
-static uint16 CurBit = 0, framenumber = 0, samplespeed, numchunks = 1;
-static byte *Buffer, temp[5];
-static bool FirstThru = true, donepal   = false;
-static byte *storagefordifffile, * *difffile = &storagefordifffile;
-
 void diffNextFrame() {
 	if (header == 65535)  /* Already done. */
 		return;
@@ -474,10 +454,6 @@ bool readDiff(bool playonce) {
 	return true;
 }
 
-
-static byte *mstart;
-
-
 void readSound(bool waitTillFinished) {
 	uint32 header_ = 0, size_;
 	uint16 samplespeed_;