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

svn-id: r28966

18 files changed, 32 insertions, 32 deletions

diff --git a/engines/sword1/animation.cpp b/engines/sword1/animation.cpp
index d54968daeb..2bb027ddb4 100644
--- a/engines/sword1/animation.cpp
+++ b/engines/sword1/animation.cpp
@@ -23,7 +23,7 @@
  *
  */
 
-#include "common/stdafx.h"
+
 #include "common/file.h"
 #include "sword1/sword1.h"
 #include "sword1/animation.h"
diff --git a/engines/sword1/control.cpp b/engines/sword1/control.cpp
index c5b968aabe..388cb132da 100644
--- a/engines/sword1/control.cpp
+++ b/engines/sword1/control.cpp
@@ -23,7 +23,7 @@
  *
  */
 
-#include "common/stdafx.h"
+
 #include "common/file.h"
 #include "common/util.h"
 #include "common/savefile.h"
diff --git a/engines/sword1/credits.cpp b/engines/sword1/credits.cpp
index 0dd190232a..14dd0ecd2b 100644
--- a/engines/sword1/credits.cpp
+++ b/engines/sword1/credits.cpp
@@ -23,7 +23,7 @@
  *
  */
 
-#include "common/stdafx.h"
+
 #include "common/endian.h"
 
 #include "sword1/credits.h"
diff --git a/engines/sword1/debug.cpp b/engines/sword1/debug.cpp
index 9eddc60942..ca74ea63b2 100644
--- a/engines/sword1/debug.cpp
+++ b/engines/sword1/debug.cpp
@@ -23,7 +23,7 @@
  *
  */
 
-#include "common/stdafx.h"
+
 #include "common/util.h"
 #include "sword1/debug.h"
 
diff --git a/engines/sword1/eventman.cpp b/engines/sword1/eventman.cpp
index 74c8b30f9a..3d36880700 100644
--- a/engines/sword1/eventman.cpp
+++ b/engines/sword1/eventman.cpp
@@ -23,7 +23,7 @@
  *
  */
 
-#include "common/stdafx.h"
+
 #include "sword1/eventman.h"
 #include "sword1/sworddefs.h"
 #include "common/util.h"
diff --git a/engines/sword1/logic.cpp b/engines/sword1/logic.cpp
index 60103ba5f9..c761628128 100644
--- a/engines/sword1/logic.cpp
+++ b/engines/sword1/logic.cpp
@@ -23,7 +23,7 @@
  *
  */
 
-#include "common/stdafx.h"
+
 #include "common/endian.h"
 #include "common/util.h"
 
@@ -67,7 +67,7 @@ Logic::Logic(ObjectMan *pObjMan, ResMan *resMan, Screen *pScreen, Mouse *pMouse,
 	_eventMan = NULL;
 	_system = system;
 	_mixer = mixer;
-	
+
 	setupMcodeTable();
 }
 
@@ -789,7 +789,7 @@ void Logic::setupMcodeTable() {
 		&Logic::fnPurple,
 		&Logic::fnBlack
 	};
-	
+
 	_mcodeTable = mcodeTable;
 }
 
diff --git a/engines/sword1/memman.cpp b/engines/sword1/memman.cpp
index 558140b73b..4d7f2abe53 100644
--- a/engines/sword1/memman.cpp
+++ b/engines/sword1/memman.cpp
@@ -23,7 +23,7 @@
  *
  */
 
-#include "common/stdafx.h"
+
 #include "sword1/memman.h"
 #include "common/util.h"
 
diff --git a/engines/sword1/menu.cpp b/engines/sword1/menu.cpp
index 0ffeb2b1a0..4c21b77411 100644
--- a/engines/sword1/menu.cpp
+++ b/engines/sword1/menu.cpp
@@ -23,7 +23,7 @@
  *
  */
 
-#include "common/stdafx.h"
+
 #include "sword1/menu.h"
 #include "sword1/resman.h"
 #include "common/scummsys.h"
diff --git a/engines/sword1/mouse.cpp b/engines/sword1/mouse.cpp
index cc4bd5e028..6e9888a5bb 100644
--- a/engines/sword1/mouse.cpp
+++ b/engines/sword1/mouse.cpp
@@ -23,7 +23,7 @@
  *
  */
 
-#include "common/stdafx.h"
+
 #include "common/system.h"
 
 #include "graphics/cursorman.h"
diff --git a/engines/sword1/music.cpp b/engines/sword1/music.cpp
index e6acd8f3cd..2b8f622dc0 100644
--- a/engines/sword1/music.cpp
+++ b/engines/sword1/music.cpp
@@ -23,7 +23,7 @@
  *
  */
 
-#include "common/stdafx.h"
+
 #include "common/endian.h"
 #include "common/file.h"
 #include "common/util.h"
@@ -108,12 +108,12 @@ int BaseAudioStream::readBuffer(int16 *buffer, const int numSamples) {
 					*buffer++ = (int16)*src++ << 8;
 			}
 		}
-		
+
 		if (!_samplesLeft && _loop) {
 			rewind();
 		}
 	}
-	
+
 	return retVal;
 }
 
@@ -173,7 +173,7 @@ AiffAudioStream::AiffAudioStream(Common::SeekableReadStream *source, bool loop)
 void AiffAudioStream::rewind() {
 	int rate, size;
 	byte flags;
-	
+
 	_sourceStream->seek(0);
 
 	if (Audio::loadAIFFFromStream(*_sourceStream, size, rate, flags)) {
@@ -189,7 +189,7 @@ int AiffAudioStream::readBuffer(int16 *buffer, const int numSamples) {
 			buffer[i] = (int16)READ_BE_UINT16(buffer + i);
 		}
 	}
-	
+
 	return retVal;
 }
 
@@ -244,7 +244,7 @@ bool MusicHandle::play(const char *fileBase, bool loop) {
 		if (_file.open(fileName))
 			_audioSource = new AiffAudioStream(&_file, loop);
 	}
-	
+
 	if (!_audioSource)
 		return false;
 
diff --git a/engines/sword1/objectman.cpp b/engines/sword1/objectman.cpp
index 0d3a79b1d2..d54b85dc66 100644
--- a/engines/sword1/objectman.cpp
+++ b/engines/sword1/objectman.cpp
@@ -23,7 +23,7 @@
  *
  */
 
-#include "common/stdafx.h"
+
 #include "common/util.h"
 
 #include "sword1/objectman.h"
diff --git a/engines/sword1/resman.cpp b/engines/sword1/resman.cpp
index 0ed9b833f1..5f1c23d482 100644
--- a/engines/sword1/resman.cpp
+++ b/engines/sword1/resman.cpp
@@ -23,7 +23,7 @@
  *
  */
 
-#include "common/stdafx.h"
+
 #include "common/config-manager.h"
 #include "common/util.h"
 #include "common/str.h"
@@ -421,7 +421,7 @@ void ResMan::openScriptResourceBigEndian(uint32 id) {
 		needByteSwap = (memHandle->cond == MEM_FREED);
 	}
 	resOpen(id);
-	if (needByteSwap) {	
+	if (needByteSwap) {
 		MemHandle *handle = resHandle(id);
 		// uint32 totSize = handle->size;
 		Header *head = (Header*)handle->data;
@@ -450,7 +450,7 @@ void ResMan::openScriptResourceLittleEndian(uint32 id) {
 		needByteSwap = (memHandle->cond == MEM_FREED);
 	}
 	resOpen(id);
-	if (needByteSwap) {	
+	if (needByteSwap) {
 		MemHandle *handle = resHandle(id);
 		// uint32 totSize = handle->size;
 		Header *head = (Header*)handle->data;
diff --git a/engines/sword1/router.cpp b/engines/sword1/router.cpp
index 6478674eb2..f6d5e714fc 100644
--- a/engines/sword1/router.cpp
+++ b/engines/sword1/router.cpp
@@ -23,7 +23,7 @@
  *
  */
 
-#include "common/stdafx.h"
+
 #include "common/util.h"
 
 #include "sword1/router.h"
diff --git a/engines/sword1/screen.cpp b/engines/sword1/screen.cpp
index 078f14a00e..63e2adaa53 100644
--- a/engines/sword1/screen.cpp
+++ b/engines/sword1/screen.cpp
@@ -23,7 +23,7 @@
  *
  */
 
-#include "common/stdafx.h"
+
 #include "common/system.h"
 #include "common/util.h"
 
@@ -139,7 +139,7 @@ void Screen::fnSetPalette(uint8 start, uint16 length, uint32 id, bool fadeUp) {
 	uint8 *palData = (uint8*)_resMan->openFetchRes(id);
 	if (start == 0) // force color 0 to black
 		palData[0] = palData[1] = palData[2] = 0;
-	
+
 	if (SwordEngine::_systemVars.isMac) {  // see bug #1701058
 		if (start != 0 && start + length == 256) // and force color 255 to black as well
 			palData[(length-1)*3+0] = palData[(length-1)*3+1] = palData[(length-1)*3+2] = 0;
diff --git a/engines/sword1/sound.cpp b/engines/sword1/sound.cpp
index 2594aaf8f4..44394ee1d9 100644
--- a/engines/sword1/sound.cpp
+++ b/engines/sword1/sound.cpp
@@ -23,7 +23,7 @@
  *
  */
 
-#include "common/stdafx.h"
+
 #include "common/endian.h"
 
 #include "common/util.h"
diff --git a/engines/sword1/staticres.cpp b/engines/sword1/staticres.cpp
index 63a1ce35ef..c4fee3b1b1 100644
--- a/engines/sword1/staticres.cpp
+++ b/engines/sword1/staticres.cpp
@@ -23,7 +23,7 @@
  *
  */
 
-#include "common/stdafx.h"
+
 #include "sword1/sworddefs.h"
 #include "sword1/swordres.h"
 #include "sword1/screen.h"
diff --git a/engines/sword1/sword1.cpp b/engines/sword1/sword1.cpp
index b5152f33bc..625f484ed5 100644
--- a/engines/sword1/sword1.cpp
+++ b/engines/sword1/sword1.cpp
@@ -23,7 +23,7 @@
  *
  */
 
-#include "common/stdafx.h"
+
 #include "sword1/sword1.h"
 
 #include "base/plugins.h"
@@ -128,7 +128,7 @@ GameList Engine_SWORD1_detectGames(const FSList &fslist) {
 	bool filesFound[NUM_FILES_TO_CHECK];
 	for (i = 0; i < NUM_FILES_TO_CHECK; i++)
 		filesFound[i] = false;
-		
+
 	Sword1CheckDirectory(fslist, filesFound);
 	bool mainFilesFound = true;
 	bool pcFilesFound = true;
@@ -181,7 +181,7 @@ SwordEngine::SwordEngine(OSystem *syst)
 	if (!scumm_stricmp(ConfMan.get("gameid").c_str(), "sword1demo"))
 		_features = GF_DEMO;
 	else
-		_features = 0;	
+		_features = 0;
 
 	if (!_mixer->isReady())
 		warning("Sound initialization failed");
@@ -215,12 +215,12 @@ int SwordEngine::init() {
 		initCommonGFX(true);
 		_system->initSize(640, 480);
 	_system->endGFXTransaction();
-	
+
 	if ( 0 == scumm_stricmp(ConfMan.get("gameid").c_str(), "sword1mac") ||
 	     0 == scumm_stricmp(ConfMan.get("gameid").c_str(), "sword1macdemo") )
 		_systemVars.isMac = true;
 	else
-		_systemVars.isMac = false;	
+		_systemVars.isMac = false;
 
 	checkCdFiles();
 
diff --git a/engines/sword1/text.cpp b/engines/sword1/text.cpp
index adab06e283..83ed38c530 100644
--- a/engines/sword1/text.cpp
+++ b/engines/sword1/text.cpp
@@ -23,7 +23,7 @@
  *
  */
 
-#include "common/stdafx.h"
+
 #include "common/endian.h"
 #include "common/util.h"