LAB: Cleanup

3 files changed, 7 insertions, 50 deletions

diff --git a/engines/lab/diff.h b/engines/lab/diff.h
index e46e320a13..e1644d49ab 100644
--- a/engines/lab/diff.h
+++ b/engines/lab/diff.h
@@ -50,9 +50,7 @@ struct BitMap {
 	byte *Planes[16];
 };
 
-#if !defined(DOSCODE)
 #define BITMAPF_VIDEO (1<<7)
-#endif
 
 /* unDiff.c */
 
diff --git a/engines/lab/engine.cpp b/engines/lab/engine.cpp
index 447a8fec55..6f4f4e54b8 100644
--- a/engines/lab/engine.cpp
+++ b/engines/lab/engine.cpp
@@ -1405,32 +1405,14 @@ void LabEngine::go() {
 
 #if 0
 	for (counter = 1; counter < argc; counter++) {
-#if defined(DOSCODE)
-
-		if (((argv[counter])[0] == 'v') || ((argv[counter])[0] == 'V')) {
-			IsHiRes = false;
-		} else
-#endif
 			if (((argv[counter])[0] == 'q') || ((argv[counter])[0] == 'Q')) {
 				DoMusic = false;
 				g_music->_turnMusicOn = false;
 			}
 
-#ifdef _DEBUG
-			else if (((argv[counter])[0] == 'i') || ((argv[counter])[0] == 'I')) {
-				dointro = false;
-			}
-
-#endif
 			else if (((argv[counter])[0] == '/') && ((argv[counter])[1] == '?')) {
 				debug("\n\nPlayer Version 1.0.  Copyright (c) 1993 Terra Nova Development\n");
 				debug("Player v q\n");
-#ifdef _DEBUG
-				debug("    i : Skip intro (debug only).\n");
-#endif
-#if defined(DOSCODE)
-				debug("    v : Open up on a low res VGA display.\n");
-#endif
 				debug("    q : Start in quiet mode; no sound output.\n\n");
 				return;
 			}
diff --git a/engines/lab/readdiff.cpp b/engines/lab/readdiff.cpp
index 8da94d696a..b270f3b8d5 100644
--- a/engines/lab/readdiff.cpp
+++ b/engines/lab/readdiff.cpp
@@ -197,25 +197,17 @@ void diffNextFrame(void) {
 			IsAnim = (framenumber >= 3) && (!PlayOnce);
 			CurBit = 0;
 
-#if !defined(DOSCODE)
-
 			if (DispBitMap->Flags & BITMAPF_VIDEO)
 				WSDL_UpdateScreen();
 
-#endif
-
 			return; /* done with the next frame. */
 		}
 
 		g_music->updateMusic();
 		readBlock(&header, 4L, difffile);
-#if !defined(DOSCODE)
 		swapULongPtr(&header, 1);
-#endif
 		readBlock(&size, 4L, difffile);
-#if !defined(DOSCODE)
 		swapULongPtr(&size, 1);
-#endif
 
 		processed += 8L;
 
@@ -292,9 +284,7 @@ void diffNextFrame(void) {
 
 			skip(difffile, 4L);
 			readBlock(&samplespeed, 2L, difffile);
-#if !defined(DOSCODE)
 			swapUShortPtr(&samplespeed, 1);
-#endif
 			skip(difffile, 2L);
 
 			byte *music = *difffile;
@@ -387,10 +377,10 @@ void playDiff(void) {
 	continuous = false;
 	readBlock(temp, 4L, difffile);
 	temp[4] = '\0';
+
 	readBlock(&header, 4L, difffile);
-#if !defined(DOSCODE)
 	swapULongPtr(&header, 1);
-#endif
+
 	processed += 8L;
 
 	if (!((strcmp((char *)temp, "DIFF") == 0) && (header == 1219009121L))) {
@@ -399,13 +389,10 @@ void playDiff(void) {
 	}
 
 	readBlock(&header, 4L, difffile);
-#if !defined(DOSCODE)
 	swapULongPtr(&header, 1);
-#endif
+
 	readBlock(&size, 4L, difffile);
-#if !defined(DOSCODE)
 	swapULongPtr(&size, 1);
-#endif
 
 	if (header == 0) {
 		// sizeof(headerdata) != 18, but the padding might be at the end
@@ -420,12 +407,10 @@ void playDiff(void) {
 
 		skip(difffile, size - 18);
 
-#if !defined(DOSCODE)
 		swapUShortPtr(&headerdata.Version, 3);
 		swapULongPtr(&headerdata.BufferSize, 1);
 		swapUShortPtr(&headerdata.Machine, 1);
 		swapULongPtr(&headerdata.Flags, 1);
-#endif
 
 		continuous = CONTINUOUS & headerdata.Flags;
 		diffwidth = headerdata.x;
@@ -546,22 +531,18 @@ void readSound(void) {
 	readBlock(temp_, 4L, difffile_);
 	temp_[4] = '\0';
 	readBlock(&header_, 4L, difffile_);
-#if !defined(DOSCODE)
 	swapULongPtr(&header_, 1);
-#endif
+
 	processed += 8L;
 
 	if (!((strcmp(temp_, "DIFF") == 0) && (header_ == 1219009121L)))
 		return;
 
 	readBlock(&header_, 4L, difffile_);
-#if !defined(DOSCODE)
 	swapULongPtr(&header_, 1);
-#endif
+
 	readBlock(&size_, 4L, difffile_);
-#if !defined(DOSCODE)
 	swapULongPtr(&size_, 1);
-#endif
 
 	if (header_ == 0)
 		skip(difffile_, size_);
@@ -571,13 +552,10 @@ void readSound(void) {
 	while (header_ != 65535) {
 		g_music->updateMusic();
 		readBlock(&header_, 4L, difffile_);
-#if !defined(DOSCODE)
 		swapULongPtr(&header_, 1);
-#endif
+
 		readBlock(&size_, 4L, difffile_);
-#if !defined(DOSCODE)
 		swapULongPtr(&size_, 1);
-#endif
 
 		if ((header_ == 30) || (header_ == 31)) {
 			if (mwaiteffect) {
@@ -591,9 +569,8 @@ void readSound(void) {
 
 			skip(difffile_, 4L);
 			readBlock(&samplespeed_, 2L, difffile_);
-#if !defined(DOSCODE)
 			swapUShortPtr(&samplespeed_, 1);
-#endif
+
 			skip(difffile_, 2L);
 
 			byte *music = *difffile_;