Merged common/stdafx.h into common/scummsys.h. All referencing files have been updated.

svn-id: r28966

15 files changed, 97 insertions, 99 deletions

diff --git a/engines/lure/debugger.cpp b/engines/lure/debugger.cpp
index 5d1198c360..87c422c641 100644
--- a/engines/lure/debugger.cpp
+++ b/engines/lure/debugger.cpp
@@ -23,7 +23,7 @@
  *
  */
 
-#include "common/stdafx.h"
+
 #include "common/config-manager.h"
 #include "common/endian.h"
 #include "lure/luredefs.h"
@@ -51,12 +51,12 @@ Debugger::Debugger(): GUI::Debugger() {
 }
 
 static int strToInt(const char *s) {
-	if (!*s) 
+	if (!*s)
 		// No string at all
 		return 0;
-	else if (strcmp(s, "player") == 0) 
+	else if (strcmp(s, "player") == 0)
 		return PLAYER_ID;
-	else if (strcmp(s, "ratpouch") == 0) 
+	else if (strcmp(s, "ratpouch") == 0)
 		return RATPOUCH_ID;
 	else if (toupper(s[strlen(s) - 1]) != 'H')
 		// Standard decimal string
@@ -93,11 +93,11 @@ bool Debugger::cmd_enterRoom(int argc, const char **argv) {
 
 		if (argc > 2) {
 			remoteFlag = strToInt(argv[2]);
-		} 
+		}
 
 		room.leaveRoom();
 		room.setRoomNumber(roomNumber);
-		if (!remoteFlag) 
+		if (!remoteFlag)
 			res.getActiveHotspot(PLAYER_ID)->setRoomNumber(roomNumber);
 
 		_detach_now = true;
@@ -119,10 +119,10 @@ bool Debugger::cmd_listRooms(int argc, const char **argv) {
 	DebugPrintf("Available rooms are:\n");
 	for (RoomDataList::iterator i = rooms.begin(); i != rooms.end(); ++i) {
 		RoomData *room = *i;
-		// Explictly note the second drawbridge room as "Alt" 
-		if (room->roomNumber == 49) { 
+		// Explictly note the second drawbridge room as "Alt"
+		if (room->roomNumber == 49) {
 			strings.getString(47, buffer);
-			strcat(buffer, " (alt)"); 
+			strcat(buffer, " (alt)");
 		} else {
 			strings.getString(room->roomNumber, buffer);
 		}
@@ -150,7 +150,7 @@ bool Debugger::cmd_listFields(int argc, const char **argv) {
 
 	for (int ctr = 0; ctr < fields.size(); ++ctr) {
 		DebugPrintf("(%-2d): %-5d", ctr, fields.getField(ctr));
-		if (!((ctr + 1) % 7)) 
+		if (!((ctr + 1) % 7))
 			DebugPrintf("\n");
 	}
 	DebugPrintf("\n");
@@ -163,7 +163,7 @@ bool Debugger::cmd_setField(int argc, const char **argv) {
 	if (argc >= 3) {
 		int fieldNum = strToInt(argv[1]);
 		uint16 value = strToInt(argv[2]);
-		
+
 		if ((fieldNum < 0) || (fieldNum >= fields.size())) {
 			// Invalid field number
 			DebugPrintf("Invalid field number specified\n");
@@ -188,7 +188,7 @@ bool Debugger::cmd_queryField(int argc, const char **argv) {
 			DebugPrintf("Invalid field number specified\n");
 		} else {
 			// Get the field value
-			DebugPrintf("Field %d is %d (%xh)\n", fieldNum, 
+			DebugPrintf("Field %d is %d (%xh)\n", fieldNum,
 				fields.getField(fieldNum), fields.getField(fieldNum));
 		}
 	} else {
@@ -207,7 +207,7 @@ bool Debugger::cmd_giveItem(int argc, const char **argv) {
 	if (argc >= 2) {
 		itemNum = strToInt(argv[1]);
 
-		if (argc == 3) 
+		if (argc == 3)
 			charNum = strToInt(argv[2]);
 
 		itemHotspot = res.getHotspot(itemNum);
@@ -236,7 +236,7 @@ bool Debugger::cmd_hotspots(int argc, const char **argv) {
 	StringData &strings = StringData::getReference();
 	Room &room = Room::getReference();
 	char buffer[MAX_DESC_SIZE];
-	
+
 	if (argc > 1) {
 		if (strcmp(argv[1], "active") == 0) {
 			// Loop for displaying active hotspots
@@ -288,7 +288,7 @@ bool Debugger::cmd_hotspot(int argc, const char **argv) {
 	if (argc < 2) {
 		DebugPrintf("hotspot <hotspot_id> ['paths' | 'schedule' | 'actions' | 'activate' | 'deactivate']\n");
 		return true;
-	} 
+	}
 	hs = res.getHotspot(strToInt(argv[1]));
 	if (!hs) {
 		DebugPrintf("Unknown hotspot specified\n");
@@ -299,22 +299,22 @@ bool Debugger::cmd_hotspot(int argc, const char **argv) {
 	if (argc == 2) {
 		// Show the hotspot properties
 		strings.getString(hs->nameId, buffer);
-		DebugPrintf("name = %d - %s, descs = (%d,%d)\n", hs->nameId, buffer, 
+		DebugPrintf("name = %d - %s, descs = (%d,%d)\n", hs->nameId, buffer,
 			hs->descId, hs->descId2);
 		DebugPrintf("actions = %xh, offset = %xh\n", hs->actions, hs->actionsOffset);
 		DebugPrintf("flags = %xh, layer = %d\n", hs->flags, hs->layer);
 		DebugPrintf("position = %d,%d,%d\n", hs->startX, hs->startY, hs->roomNumber);
-		DebugPrintf("size = %d,%d, alt = %d,%d, yCorrection = %d\n", 
+		DebugPrintf("size = %d,%d, alt = %d,%d, yCorrection = %d\n",
 			hs->width, hs->height,  hs->widthCopy, hs->heightCopy, hs->yCorrection);
 		DebugPrintf("Talk bubble offset = %d,%d\n", hs->talkX, hs->talkY);
 		DebugPrintf("load offset = %xh, script load = %d\n", hs->loadOffset, hs->scriptLoadFlag);
 		DebugPrintf("Animation Id = %xh, Colour offset = %d\n", hs->animRecordId, hs->colourOffset);
-		DebugPrintf("Talk Script offset = %xh, Tick Script offset = %xh\n", 
+		DebugPrintf("Talk Script offset = %xh, Tick Script offset = %xh\n",
 			hs->talkScriptOffset, hs->tickScriptOffset);
 		DebugPrintf("Tick Proc offset = %xh\n", hs->tickProcOffset);
 		DebugPrintf("Tick timeout = %d\n", hs->tickTimeout);
 		DebugPrintf("NPC Shcedule = %xh\n", hs->npcSchedule);
-		DebugPrintf("Character mode = %d, delay ctr = %d, pause ctr = %d\n", 
+		DebugPrintf("Character mode = %d, delay ctr = %d, pause ctr = %d\n",
 			hs->characterMode, hs->delayCtr, hs->pauseCtr);
 
 		if (h != NULL) {
@@ -347,13 +347,13 @@ bool Debugger::cmd_hotspot(int argc, const char **argv) {
 		DebugPrintf("Deactivated\n");
 
 	} else {
-		if (!h) 
+		if (!h)
 			DebugPrintf("The specified hotspot is not currently active\n");
 		else if (strcmp(argv[2], "paths") == 0) {
 			// List any paths for a charcter
 			h->pathFinder().list(buffer);
 			DebugPrintf("%s", buffer);
-		} 
+		}
 		else if (strcmp(argv[2], "schedule") == 0) {
 			// List any current schedule for the character
 			h->currentActions().list(buffer);
@@ -365,7 +365,7 @@ bool Debugger::cmd_hotspot(int argc, const char **argv) {
 			DebugPrintf("Record Id = %xh\n", pData.animRecordId);
 			DebugPrintf("Flags = %d\n", pData.flags);
 			DebugPrintf("Frames: up=%d down=%d left=%d right=%d\n",
-				pData.upFrame, pData.downFrame, pData.leftFrame, pData.rightFrame);		
+				pData.upFrame, pData.downFrame, pData.leftFrame, pData.rightFrame);
 			DebugPrintf("Current frame = %d of %d\n", h->frameNumber(), h->numFrames());
 		}
 	}
@@ -384,7 +384,7 @@ bool Debugger::cmd_room(int argc, const char **argv) {
 	if (argc < 2) {
 		DebugPrintf("room <room_number>\n");
 		return true;
-	} 
+	}
 	int roomNumber = strToInt(argv[1]);
 	RoomData *room = res.getRoom(roomNumber);
 	if (!room) {
@@ -398,8 +398,8 @@ bool Debugger::cmd_room(int argc, const char **argv) {
 	strings.getString(room->descId, buffer);
 	DebugPrintf("%s\n", buffer);
 	DebugPrintf("Horizontal clipping = %d->%d walk area=(%d,%d)-(%d,%d)\n",
-		room->clippingXStart, room->clippingXEnd, 
-		room->walkBounds.left, room->walkBounds.top, 
+		room->clippingXStart, room->clippingXEnd,
+		room->walkBounds.left, room->walkBounds.top,
 		room->walkBounds.right, room->walkBounds.bottom);
 
 	DebugPrintf("Exit hotspots:");
@@ -410,7 +410,7 @@ bool Debugger::cmd_room(int argc, const char **argv) {
 		RoomExitHotspotList::iterator i;
 		for (i = exits.begin(); i != exits.end(); ++i) {
 			RoomExitHotspotData *rec = *i;
-			
+
 			DebugPrintf("\nArea - (%d,%d)-(%d,%d) Room=%d Cursor=%d Hotspot=%xh",
 				rec->xs, rec->ys, rec->xe, rec->ye, rec->destRoomNumber, rec->cursorNum, rec->hotspotId);
 		}
@@ -419,7 +419,7 @@ bool Debugger::cmd_room(int argc, const char **argv) {
 	}
 
 	DebugPrintf("Room exits:");
-	if (room->exits.empty()) 
+	if (room->exits.empty())
 		DebugPrintf(" none\n");
 	else {
 		RoomExitList::iterator i2;
@@ -427,7 +427,7 @@ bool Debugger::cmd_room(int argc, const char **argv) {
 			RoomExitData *rec2 = *i2;
 
 			DebugPrintf("\nExit - (%d,%d)-(%d,%d) Dest=%d,(%d,%d) Dir=%s Sequence=%xh",
-				rec2->xs, rec2->ys, rec2->xe, rec2->ye, rec2->roomNumber, 
+				rec2->xs, rec2->ys, rec2->xe, rec2->ye, rec2->roomNumber,
 				rec2->x, rec2->y, directionList[rec2->direction], rec2->sequenceOffset);
 		}
 
@@ -455,7 +455,7 @@ bool Debugger::cmd_showAnim(int argc, const char **argv) {
 	// Figure out the total size of the animation - this will be used for guestimating
 	// frame sizes, or validating that a specified frame size is correct
 	MemoryBlock *src = Disk::getReference().getEntry(data->animId);
-	
+
 	int numFrames = READ_LE_UINT16(src->data());
 	uint16 *headerEntry = (uint16 *) (src->data() + 2);
 	assert((numFrames >= 1) && (numFrames < 100));
@@ -498,9 +498,9 @@ bool Debugger::cmd_showAnim(int argc, const char **argv) {
 				destSize, width, height, numFrames, width * height * numFrames / 2);
 		}
 	} else {
-		// Guestimate a frame size 
+		// Guestimate a frame size
 		frameSize = destSize / numFrames;
-		
+
 		// Figure out the approximate starting point of a width 3/4 the frame size
 		width = frameSize * 3 / 4;
 
@@ -509,7 +509,7 @@ bool Debugger::cmd_showAnim(int argc, const char **argv) {
 
 		while ((width > 0) && (descFlag || (((frameSize * 2) % width) != 0))) {
 			if (((frameSize * 2) % width) == 0)
-				DebugPrintf("Frame size (%d,%d) found\n", width, frameSize * 2 / width); 
+				DebugPrintf("Frame size (%d,%d) found\n", width, frameSize * 2 / width);
 			--width;
 		}
 
@@ -520,14 +520,14 @@ bool Debugger::cmd_showAnim(int argc, const char **argv) {
 			DebugPrintf("Total size = %d, # frames = %d, frame Size = %d - No valid frame dimensions\n",
 				destSize, numFrames, frameSize);
 			return true;
-		} 
+		}
 
 		height = (frameSize * 2) / width;
 		DebugPrintf("# frames = %d, guestimated frame size = (%d,%d)\n",
 			numFrames, width, height);
 	}
 
-	// Bottle object is used as a handy hotspot holder that doesn't have any 
+	// Bottle object is used as a handy hotspot holder that doesn't have any
 	// tick proc behaviour that we need to worry about
 	Hotspot *hotspot = res.activateHotspot(BOTTLE_HOTSPOT_ID);
 	hotspot->setLayer(0xfe);
diff --git a/engines/lure/decode.h b/engines/lure/decode.h
index 8e4e87a07d..ff83ba6454 100644
--- a/engines/lure/decode.h
+++ b/engines/lure/decode.h
@@ -26,7 +26,7 @@
 #ifndef LURE_DECODE_H
 #define LURE_DECODE_H
 
-#include "common/stdafx.h"
+
 #include "lure/luredefs.h"
 #include "lure/memory.h"
 
@@ -56,7 +56,7 @@ class AnimationDecoder {
 public:
 	static void rcl(uint16 &value, bool &carry);
 	static uint32 decode_data(MemoryBlock *src, MemoryBlock *dest, uint32 srcPos);
-	static void decode_data_2(byte *&pSrc, uint16 &currData, uint16 &bitCtr, 
+	static void decode_data_2(byte *&pSrc, uint16 &currData, uint16 &bitCtr,
 					   uint16 &dx, bool &carry);
 };
 
diff --git a/engines/lure/detection.cpp b/engines/lure/detection.cpp
index 4291b9aedb..3fa6278016 100644
--- a/engines/lure/detection.cpp
+++ b/engines/lure/detection.cpp
@@ -23,8 +23,6 @@
  *
  */
 
-#include "common/stdafx.h"
-
 #include "base/plugins.h"
 
 #include "common/advancedDetector.h"
@@ -121,7 +119,7 @@ GameList Engine_LURE_detectGames(const FSList &fslist) {
 			printf("Your game version appears to be unknown. Please, report the following\n");
 			printf("data to the ScummVM team along with name of the game you tried to add\n");
 			printf("and its version/language/etc.:\n");
-			
+
 			printf("  LURE MD5 '%s'\n\n", md5str);
 
 			const PlainGameDescriptor *g1 = lure_list;
@@ -174,11 +172,11 @@ void LureEngine::detectGame() {
 			error("Error validating %s - file is invalid or out of date", SUPPORT_FILENAME);
 		else if ((version.vMajor != LURE_DAT_MAJOR) || (version.vMinor != LURE_DAT_MINOR))
 			error("Incorrect version of %s file - expected %d.%d but got %d.%d",
-				SUPPORT_FILENAME, LURE_DAT_MAJOR, LURE_DAT_MINOR, 
+				SUPPORT_FILENAME, LURE_DAT_MAJOR, LURE_DAT_MINOR,
 				version.vMajor, version.vMinor);
 	}
 
-	// Do an md5 check 
+	// Do an md5 check
 
 	char md5str[32 + 1];
 	const GameSettings *g;
diff --git a/engines/lure/disk.cpp b/engines/lure/disk.cpp
index b5465df8d9..d1a7239c4c 100644
--- a/engines/lure/disk.cpp
+++ b/engines/lure/disk.cpp
@@ -23,7 +23,7 @@
  *
  */
 
-#include "common/stdafx.h"
+
 #include "common/endian.h"
 #include "common/file.h"
 #include "common/util.h"
@@ -64,9 +64,9 @@ uint8 Disk::indexOf(uint16 id, bool suppressError) {
 		if (_entries[entryIndex].id == HEADER_ENTRY_UNUSED_ID) break;
 		else if (_entries[entryIndex].id == id) return entryIndex;
 	}
-	
+
 	if (suppressError) return 0xff;
-	if (_fileNum == 0) 
+	if (_fileNum == 0)
 		error("Could not find entry Id #%d in file %s", id, SUPPORT_FILENAME);
 	else
 		error("Could not find entry Id #%d in file disk%d.vga", id, _fileNum);
@@ -79,16 +79,16 @@ void Disk::openFile(uint8 fileNum) {
 
 	// Only load up the new file if the current file number has changed
 	if (fileNum == _fileNum) return;
-	
+
 	// Delete any existing open file handle
-	if (_fileNum != 0xff) delete _fileHandle;		
+	if (_fileNum != 0xff) delete _fileHandle;
 	_fileNum = fileNum;
-	
+
 	// Open up the the new file
 	_fileHandle = new Common::File();
 
 	char sFilename[10];
-	if (_fileNum == 0) 
+	if (_fileNum == 0)
 		strcpy(sFilename, SUPPORT_FILENAME);
 	else
 		sprintf(sFilename, "disk%d.vga", _fileNum);
@@ -155,7 +155,7 @@ MemoryBlock *Disk::getEntry(uint16 id) {
 
 	// Get the index of the resource, if necessary opening the correct file
 	uint8 index = indexOf(id);
-		
+
 	// Calculate the offset and size of the entry
 	uint32 size = (uint32) _entries[index].size;
 	if (_entries[index].sizeExtension) size += 0x10000;
@@ -180,7 +180,7 @@ uint8 Disk::numEntries() {
 	// Figure out how many entries there are by count until an unused entry is found
 	for (byte entryIndex = 0; entryIndex < NUM_ENTRIES_IN_HEADER; ++entryIndex)
 		if (_entries[entryIndex].id == HEADER_ENTRY_UNUSED_ID) return entryIndex;
-	
+
 	return NUM_ENTRIES_IN_HEADER;
 }
 
diff --git a/engines/lure/disk.h b/engines/lure/disk.h
index 47ff7901c5..5e5717112c 100644
--- a/engines/lure/disk.h
+++ b/engines/lure/disk.h
@@ -26,7 +26,7 @@
 #ifndef LURE_DISK_H
 #define LURE_DISK_H
 
-#include "common/stdafx.h"
+
 #include "common/scummsys.h"
 #include "common/str.h"
 #include "lure/memory.h"
diff --git a/engines/lure/events.cpp b/engines/lure/events.cpp
index 055bfac49c..68dc808392 100644
--- a/engines/lure/events.cpp
+++ b/engines/lure/events.cpp
@@ -23,7 +23,7 @@
  *
  */
 
-#include "common/stdafx.h"
+
 #include "common/events.h"
 
 #include "graphics/cursorman.h"
@@ -35,14 +35,14 @@ namespace Lure {
 
 static Mouse *int_mouse = NULL;
 
-Mouse &Mouse::getReference() { 
-	return *int_mouse; 
+Mouse &Mouse::getReference() {
+	return *int_mouse;
 }
 
 Mouse::Mouse() {
 	int_mouse = this;
 
-	_lButton = false; 
+	_lButton = false;
 	_rButton = false;
 	_cursorNum = CURSOR_ARROW;
 	_x = 0;
@@ -87,7 +87,7 @@ void Mouse::cursorOff() {
 void Mouse::setCursorNum(CursorType cursorNum) {
 	int hotspotX = 7, hotspotY = 7;
 	if ((cursorNum == CURSOR_ARROW) || (cursorNum == CURSOR_MENUBAR)) {
-		hotspotX = 0; 
+		hotspotX = 0;
 		hotspotY = 0;
 	}
 
@@ -105,7 +105,7 @@ void Mouse::setCursorNum(CursorType cursorNum, int hotspotX, int hotspotY) {
 void Mouse::pushCursorNum(CursorType cursorNum) {
 	int hotspotX = 7, hotspotY = 7;
 	if ((cursorNum == CURSOR_ARROW) || (cursorNum == CURSOR_MENUBAR)) {
-		hotspotX = 0; 
+		hotspotX = 0;
 		hotspotY = 0;
 	}
 
@@ -186,7 +186,7 @@ void Events::waitForPress() {
 			else if ((_event.type == Common::EVENT_LBUTTONDOWN) ||
 				(_event.type == Common::EVENT_RBUTTONDOWN)) {
 				keyButton = true;
-				Mouse::getReference().waitForRelease();				
+				Mouse::getReference().waitForRelease();
 			}
 		}
 		g_system->delayMillis(20);
@@ -205,7 +205,7 @@ bool Events::interruptableDelay(uint32 milliseconds) {
 		if (events.quitFlag) return true;
 
 		if (events.pollEvent()) {
-			if (events.type() == Common::EVENT_KEYDOWN) 
+			if (events.type() == Common::EVENT_KEYDOWN)
 				return events.event().kbd.keycode == 27;
 			else if (events.type() == Common::EVENT_LBUTTONDOWN)
 				return false;
diff --git a/engines/lure/events.h b/engines/lure/events.h
index 1205ebe158..fa054da949 100644
--- a/engines/lure/events.h
+++ b/engines/lure/events.h
@@ -26,7 +26,7 @@
 #ifndef LURE_EVENTS_H
 #define LURE_EVENTS_H
 
-#include "common/stdafx.h"
+
 #include "common/events.h"
 #include "common/str.h"
 #include "lure/luredefs.h"
@@ -42,7 +42,7 @@ private:
 public:
 	Mouse();
 	~Mouse();
-	static Mouse &getReference(); 
+	static Mouse &getReference();
 	void handleEvent(Common::Event event);
 
 	void cursorOn();
@@ -57,7 +57,7 @@ public:
 	bool rButton() { return _rButton; }
 	void waitForRelease();
 	void pushCursorNum(CursorType cursorNum);
-	void pushCursorNum(CursorType cursorNum, int hotspotX, int hotspotY);	
+	void pushCursorNum(CursorType cursorNum, int hotspotX, int hotspotY);
 	void popCursor();
 };
 
diff --git a/engines/lure/game.h b/engines/lure/game.h
index 50b730e354..8afbe1691b 100644
--- a/engines/lure/game.h
+++ b/engines/lure/game.h
@@ -26,7 +26,7 @@
 #ifndef LURE_GAME_H
 #define LURE_GAME_H
 
-#include "common/stdafx.h"
+
 #include "engines/engine.h"
 #include "lure/luredefs.h"
 #include "lure/menu.h"
diff --git a/engines/lure/lure.cpp b/engines/lure/lure.cpp
index ada8f5081b..6aeb05967f 100644
--- a/engines/lure/lure.cpp
+++ b/engines/lure/lure.cpp
@@ -23,7 +23,7 @@
  *
  */
 
-#include "common/stdafx.h"
+
 
 #include "common/config-manager.h"
 #include "common/system.h"
@@ -56,7 +56,7 @@ LureEngine::LureEngine(OSystem *system): Engine(system) {
 
 	_mixer->setVolumeForSoundType(Audio::Mixer::kSFXSoundType, ConfMan.getInt("sfx_volume"));
 	_mixer->setVolumeForSoundType(Audio::Mixer::kMusicSoundType, ConfMan.getInt("music_volume"));
-	
+
 	_features = 0;
 	_game = 0;
 }
@@ -178,7 +178,7 @@ bool LureEngine::loadGame(uint8 slotNumber) {
 		return false;
 	}
 
-	// Check language version 
+	// Check language version
 	uint8 language = f->readByte();
 	uint8 version = f->readByte();
 	if ((language != _language) || (version != LURE_DAT_MINOR)) {
@@ -209,7 +209,7 @@ Common::String *LureEngine::detectSave(int slotNumber) {
 	char buffer[5];
 	f->read(&buffer[0], 5);
 	if (memcmp(&buffer[0], "lure", 5) == 0) {
-		// Check language version 
+		// Check language version
 		uint8 language = f->readByte();
 		uint8 version = f->readByte();
 		if ((language == _language) && (version == LURE_DAT_MINOR)) {
diff --git a/engines/lure/luredefs.h b/engines/lure/luredefs.h
index ef48f6f452..091ea7284e 100644
--- a/engines/lure/luredefs.h
+++ b/engines/lure/luredefs.h
@@ -26,7 +26,7 @@
 #ifndef LUREDEFS_H
 #define LUREDEFS_H
 
-#include "common/stdafx.h"
+
 #include "common/scummsys.h"
 #include "common/list.h"
 
@@ -89,18 +89,18 @@ enum Action {
 	RETURN = 23,
 	BRIBE = 24,
 	EXAMINE = 25,
-	NPC_SET_ROOM_AND_OFFSET = 28, 
-	NPC_TALK_TO_PLAYER = 29, 
-	NPC_EXEC_SCRIPT = 30, 
+	NPC_SET_ROOM_AND_OFFSET = 28,
+	NPC_TALK_TO_PLAYER = 29,
+	NPC_EXEC_SCRIPT = 30,
 	NPC_RESET_PAUSED_LIST = 31,
-	NPC_SET_RAND_DEST = 32, 
-	NPC_WALKING_CHECK = 33, 
+	NPC_SET_RAND_DEST = 32,
+	NPC_WALKING_CHECK = 33,
 	NPC_SET_SUPPORT_OFFSET = 34,
-	NPC_SUPPORT_OFFSET_COND = 35, 
-	NPC_DISPATCH_ACTION = 36, 
+	NPC_SUPPORT_OFFSET_COND = 35,
+	NPC_DISPATCH_ACTION = 36,
 	NPC_TALK_NPC_TO_NPC = 37,
-	NPC_PAUSE = 38, 
-	NPC_START_TALKING = 39, 
+	NPC_PAUSE = 38,
+	NPC_START_TALKING = 39,
 	NPC_JUMP_ADDRESS = 40
 };
 
@@ -153,7 +153,7 @@ enum Action {
 enum CursorType {CURSOR_ARROW = 0, CURSOR_DISK = 1, CURSOR_TIME_START = 2,
 	CURSOR_TIME_END = 9, CURSOR_CROSS = 10, CURSOR_UP_ARROW = 11, CURSOR_DOWN_ARROW = 12,
 	CURSOR_LEFT_ARROW = 13, CURSOR_RIGHT_ARROW = 14, CURSOR_CAMERA = 15, CURSOR_TALK = 16,
-	CURSOR_MENUBAR = 17, CURSOR_FIGHT_UPPER = 23, CURSOR_FIGHT_MIDDLE = 24, 
+	CURSOR_MENUBAR = 17, CURSOR_FIGHT_UPPER = 23, CURSOR_FIGHT_MIDDLE = 24,
 	CURSOR_FIGHT_LOWER = 25};
 
 // Font details
@@ -168,12 +168,12 @@ enum CursorType {CURSOR_ARROW = 0, CURSOR_DISK = 1, CURSOR_TIME_START = 2,
 #define MENU_UNSELECTED_COLOUR 0xe2
 #define MENU_SELECTED_COLOUR 0xe3
 #define MENUITEM_NONE 0
-#define MENUITEM_CREDITS 1 
-#define MENUITEM_RESTART_GAME 2 
-#define MENUITEM_SAVE_GAME 3 
-#define MENUITEM_RESTORE_GAME 4 
-#define MENUITEM_QUIT 5 
-#define MENUITEM_TEXT_SPEED 6 
+#define MENUITEM_CREDITS 1
+#define MENUITEM_RESTART_GAME 2
+#define MENUITEM_SAVE_GAME 3
+#define MENUITEM_RESTORE_GAME 4
+#define MENUITEM_QUIT 5
+#define MENUITEM_TEXT_SPEED 6
 #define MENUITEM_SOUND 7
 
 // Mouse change needed to change an item in a popup menu
@@ -264,7 +264,7 @@ enum CursorType {CURSOR_ARROW = 0, CURSOR_DISK = 1, CURSOR_TIME_START = 2,
 #define GAME_TICK_DELAY 20
 
 // Tick proc constants
-#define STANDARD_CHARACTER_TICK_PROC 0x4f82 
+#define STANDARD_CHARACTER_TICK_PROC 0x4f82
 #define PLAYER_TICK_PROC_ID 0x5E44
 #define VOICE_TICK_PROC_ID 0x625E
 #define PUZZLED_TICK_PROC_ID 0x6571
diff --git a/engines/lure/memory.h b/engines/lure/memory.h
index 0bbefadec7..bdd9597c5e 100644
--- a/engines/lure/memory.h
+++ b/engines/lure/memory.h
@@ -26,7 +26,7 @@
 #ifndef LURE_MEMORY_H
 #define LURE_MEMORY_H
 
-#include "common/stdafx.h"
+
 #include "common/system.h"
 #include "common/str.h"
 
diff --git a/engines/lure/menu.h b/engines/lure/menu.h
index 587074e8af..4f0b3297ed 100644
--- a/engines/lure/menu.h
+++ b/engines/lure/menu.h
@@ -26,7 +26,7 @@
 #ifndef LURE_MENU_H
 #define LURE_MENU_H
 
-#include "common/stdafx.h"
+
 #include "common/str.h"
 #include "lure/luredefs.h"
 #include "lure/disk.h"
@@ -45,8 +45,8 @@ private:
 	const char **_entries;
 	uint8 _numEntries;
 public:
-	MenuRecord(uint16 hsxstartVal, uint16 hsxendVal, uint16 xstartVal, uint16 widthVal, 
-		int numParams, ...); 
+	MenuRecord(uint16 hsxstartVal, uint16 hsxendVal, uint16 xstartVal, uint16 widthVal,
+		int numParams, ...);
 
 	uint16 xstart() { return _xstart; }
 	uint16 width() { return _width; }
@@ -66,7 +66,7 @@ private:
 	uint8 _selectedIndex;
 
 	MenuRecord *getMenuAt(int x);
-	uint8 getIndexAt(uint16 x, uint16 y);	
+	uint8 getIndexAt(uint16 x, uint16 y);
 	void toggleHighlight(MenuRecord *menuRec);
 	void toggleHighlightItem(uint8 index);
 public:
diff --git a/engines/lure/room.h b/engines/lure/room.h
index 6c5dfc6747..b97df2f46a 100644
--- a/engines/lure/room.h
+++ b/engines/lure/room.h
@@ -26,7 +26,7 @@
 #ifndef LURE_ROOM_H
 #define LURE_ROOM_H
 
-#include "common/stdafx.h"
+
 #include "common/scummsys.h"
 #include "lure/disk.h"
 #include "lure/res.h"
@@ -49,7 +49,7 @@ private:
 	bool _cells[FULL_VERT_RECTS][FULL_HORIZ_RECTS];
 public:
 	RoomLayer(uint16 screenId, bool backgroundLayer);
-	bool isOccupied(byte cellX, byte cellY) { 
+	bool isOccupied(byte cellX, byte cellY) {
 		return _cells[cellY][cellX];
 	}
 };
@@ -90,7 +90,7 @@ public:
 	Room();
 	~Room();
 	static Room &getReference();
-	
+
 	void update();
 	void nextFrame();
 	void checkCursor();
diff --git a/engines/lure/screen.h b/engines/lure/screen.h
index 90db7ee314..9714405ea3 100644
--- a/engines/lure/screen.h
+++ b/engines/lure/screen.h
@@ -26,7 +26,7 @@
 #ifndef LURE_SCREEN_H
 #define LURE_SCREEN_H
 
-#include "common/stdafx.h"
+
 #include "engines/engine.h"
 #include "lure/luredefs.h"
 #include "lure/palette.h"
diff --git a/engines/lure/surface.h b/engines/lure/surface.h
index 564f65dd99..4fd27a4c38 100644
--- a/engines/lure/surface.h
+++ b/engines/lure/surface.h
@@ -26,7 +26,7 @@
 #ifndef LURE_SURFACE_H
 #define LURE_SURFACE_H
 
-#include "common/stdafx.h"
+
 #include "common/str.h"
 #include "lure/disk.h"
 #include "lure/luredefs.h"
@@ -37,13 +37,13 @@ namespace Lure {
 
 class Surface {
 private:
-	MemoryBlock *_data;	
+	MemoryBlock *_data;
 	uint16 _width, _height;
 public:
 	Surface(MemoryBlock *src, uint16 width, uint16 height);
-	Surface(uint16 width, uint16 height);		
+	Surface(uint16 width, uint16 height);
 	~Surface();
-	
+
 	static void initialise();
 	static void deinitialise();
 
@@ -53,7 +53,7 @@ public:
 
 	void loadScreen(uint16 resourceId);
 	void writeChar(uint16 x, uint16 y, uint8 ascii, bool transparent, uint8 colour);
-	void writeString(uint16 x, uint16 y, Common::String line, bool transparent, 
+	void writeString(uint16 x, uint16 y, Common::String line, bool transparent,
 		uint8 colour = DIALOG_TEXT_COLOUR, bool varLength = true);
 	void transparentCopyTo(Surface *dest);
 	void copyTo(Surface *dest);