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

svn-id: r28966

30 files changed, 47 insertions, 47 deletions

diff --git a/engines/sky/autoroute.cpp b/engines/sky/autoroute.cpp
index 3086121942..f5740467bc 100644
--- a/engines/sky/autoroute.cpp
+++ b/engines/sky/autoroute.cpp
@@ -23,7 +23,7 @@
  *
  */
 
-#include "common/stdafx.h"
+
 #include "common/endian.h"
 #include "common/util.h"
 
diff --git a/engines/sky/autoroute.h b/engines/sky/autoroute.h
index 0b9ad2912a..37818f378a 100644
--- a/engines/sky/autoroute.h
+++ b/engines/sky/autoroute.h
@@ -26,7 +26,7 @@
 #ifndef SKY_AUTOROUTE_H
 #define SKY_AUTOROUTE_H
 
-#include "common/stdafx.h"
+
 #include "common/scummsys.h"
 
 namespace Sky {
diff --git a/engines/sky/compact.cpp b/engines/sky/compact.cpp
index 2cdfbf679c..b3aba6ecab 100644
--- a/engines/sky/compact.cpp
+++ b/engines/sky/compact.cpp
@@ -23,7 +23,7 @@
  *
  */
 
-#include "common/stdafx.h"
+
 #include "common/endian.h"
 #include "common/util.h"
 #include "common/file.h"
@@ -34,8 +34,8 @@ extern int gDebugLevel;
 
 namespace Sky {
 
-#define	SKY_CPT_SIZE	419427	
-	
+#define	SKY_CPT_SIZE	419427
+
 #define OFFS(type,item) (((long)(&((type*)0)->item)))
 #define MK32(type,item) OFFS(type, item),0,0,0
 #define MK16(type,item) OFFS(type, item),0
@@ -144,7 +144,7 @@ SkyCompact::SkyCompact(void) {
 		dialog.runModal();
 		error("Incorrect sky.cpt size (%d, expected: %d)", _cptFile->size(), SKY_CPT_SIZE);
 	}
-	
+
 	// set the necessary data structs up...
 	_numDataLists = _cptFile->readUint16LE();
 	_cptNames	  = (char***)malloc(_numDataLists * sizeof(char**));
@@ -268,10 +268,10 @@ Compact *SkyCompact::fetchCpt(uint16 cptId) {
 	if (cptId == 0xFFFF) // is this really still necessary?
 		return NULL;
 	assert(((cptId >> 12) < _numDataLists) && ((cptId & 0xFFF) < _dataListLen[cptId >> 12]));
-	
+
 	if (gDebugLevel >= 8) {
 		debug(8, "Loading Compact %s [%s] (%04X=%d,%d)", _cptNames[cptId >> 12][cptId & 0xFFF], nameForType(_cptTypes[cptId >> 12][cptId & 0xFFF]), cptId, cptId >> 12, cptId & 0xFFF);
-	}		
+	}
 
 	return _compacts[cptId >> 12][cptId & 0xFFF];
 }
diff --git a/engines/sky/control.cpp b/engines/sky/control.cpp
index c03cf9688b..ee8fee9ee8 100644
--- a/engines/sky/control.cpp
+++ b/engines/sky/control.cpp
@@ -23,7 +23,7 @@
  *
  */
 
-#include "common/stdafx.h"
+
 #include "common/endian.h"
 #include "common/config-manager.h"
 #include "common/file.h"
@@ -245,7 +245,7 @@ void Control::removePanel(void) {
 	delete _musicPanButton;			delete _bodge;
 	delete _yesNo;					delete _text;
 	delete _statusBar;				delete _restoreButton;
-	
+
 	if (_textSprite) {
 		free(_textSprite);
 		_textSprite = NULL;
diff --git a/engines/sky/control.h b/engines/sky/control.h
index 217ab5714a..754f2100d2 100644
--- a/engines/sky/control.h
+++ b/engines/sky/control.h
@@ -26,7 +26,7 @@
 #ifndef SKY_CONTROL_H
 #define SKY_CONTROL_H
 
-#include "common/stdafx.h"
+
 #include "common/events.h"
 #include "common/scummsys.h"
 
diff --git a/engines/sky/debug.cpp b/engines/sky/debug.cpp
index 995a18c39b..1db7993227 100644
--- a/engines/sky/debug.cpp
+++ b/engines/sky/debug.cpp
@@ -23,7 +23,7 @@
  *
  */
 
-#include "common/stdafx.h"
+
 #include "common/endian.h"
 #include "common/util.h"
 
diff --git a/engines/sky/debug.h b/engines/sky/debug.h
index 20b518768b..0e7ab8cfad 100644
--- a/engines/sky/debug.h
+++ b/engines/sky/debug.h
@@ -26,7 +26,7 @@
 #ifndef SKY_DEBUG_H
 #define SKY_DEBUG_H
 
-#include "common/stdafx.h"
+
 #include "common/scummsys.h"
 #include "gui/debugger.h"
 
diff --git a/engines/sky/disk.cpp b/engines/sky/disk.cpp
index 0cdb05aa00..cfcf6595ee 100644
--- a/engines/sky/disk.cpp
+++ b/engines/sky/disk.cpp
@@ -23,7 +23,7 @@
  *
  */
 
-#include "common/stdafx.h"
+
 #include "common/endian.h"
 #include "common/file.h"
 #include "common/util.h"
diff --git a/engines/sky/disk.h b/engines/sky/disk.h
index b6a85569d4..5c63813248 100644
--- a/engines/sky/disk.h
+++ b/engines/sky/disk.h
@@ -26,7 +26,7 @@
 #ifndef SKY_DISK_H
 #define SKY_DISK_H
 
-#include "common/stdafx.h"
+
 #include "common/scummsys.h"
 #include "common/str.h"
 #include "sky/rnc_deco.h"
diff --git a/engines/sky/grid.h b/engines/sky/grid.h
index 366a71518f..7f3bc48e54 100644
--- a/engines/sky/grid.h
+++ b/engines/sky/grid.h
@@ -26,7 +26,7 @@
 #ifndef SKY_GRID_H
 #define SKY_GRID_H
 
-#include "common/stdafx.h"
+
 #include "common/scummsys.h"
 #include "skydefs.h"
 
diff --git a/engines/sky/intro.cpp b/engines/sky/intro.cpp
index 6d841495af..cde2f26f0b 100644
--- a/engines/sky/intro.cpp
+++ b/engines/sky/intro.cpp
@@ -23,7 +23,7 @@
  *
  */
 
-#include "common/stdafx.h"
+
 #include "common/endian.h"
 #include "common/util.h"
 #include "common/events.h"
diff --git a/engines/sky/intro.h b/engines/sky/intro.h
index 7f0b94fb52..4a54fb8dd3 100644
--- a/engines/sky/intro.h
+++ b/engines/sky/intro.h
@@ -26,7 +26,7 @@
 #ifndef SKY_INTRO_H
 #define SKY_INTRO_H
 
-#include "common/stdafx.h"
+
 #include "common/scummsys.h"
 #include "sound/mixer.h"
 
diff --git a/engines/sky/logic.cpp b/engines/sky/logic.cpp
index c5a6b32ea1..6e5c92bfa3 100644
--- a/engines/sky/logic.cpp
+++ b/engines/sky/logic.cpp
@@ -23,7 +23,7 @@
  *
  */
 
-#include "common/stdafx.h"
+
 #include "common/endian.h"
 #include "common/rect.h"
 
@@ -66,7 +66,7 @@ void Logic::setupLogicTable() {
 		&Logic::waitSync,	 // 15 Set to l_script when sync!=0
 		&Logic::simpleAnim,	 // 16 Module anim without x,y's
 	};
-	
+
 	_logicTable = logicTable;
 }
 
@@ -960,7 +960,7 @@ void Logic::setupMcodeTable() {
 		&Logic::fnUnPauseFx,
 		&Logic::fnPrintf
 	};
-	
+
 	_mcodeTable = mcodeTable;
 }
 
diff --git a/engines/sky/logic.h b/engines/sky/logic.h
index 8b42f89e5d..3d5ba36edf 100644
--- a/engines/sky/logic.h
+++ b/engines/sky/logic.h
@@ -26,7 +26,7 @@
 #ifndef SKY_LOGIC_H
 #define SKY_LOGIC_H
 
-#include "common/stdafx.h"
+
 #include "common/util.h"
 
 namespace Sky {
@@ -162,7 +162,7 @@ private:
 	void setupMcodeTable();
 	const LogicTable *_logicTable;
 	const McodeTable *_mcodeTable;
-	
+
 protected:
 	void push(uint32);
 	uint32 pop();
diff --git a/engines/sky/mouse.cpp b/engines/sky/mouse.cpp
index 524005b7e3..b3be8b4f36 100644
--- a/engines/sky/mouse.cpp
+++ b/engines/sky/mouse.cpp
@@ -23,7 +23,7 @@
  *
  */
 
-#include "common/stdafx.h"
+
 #include "common/events.h"
 #include "common/system.h"
 #include "graphics/cursorman.h"
diff --git a/engines/sky/mouse.h b/engines/sky/mouse.h
index 83e82101bc..e131134699 100644
--- a/engines/sky/mouse.h
+++ b/engines/sky/mouse.h
@@ -26,7 +26,7 @@
 #ifndef SKY_MOUSE_H
 #define SKY_MOUSE_H
 
-#include "common/stdafx.h"
+
 #include "common/scummsys.h"
 
 class OSystem;
diff --git a/engines/sky/music/adlibchannel.cpp b/engines/sky/music/adlibchannel.cpp
index fa589d64c0..588057a7c8 100644
--- a/engines/sky/music/adlibchannel.cpp
+++ b/engines/sky/music/adlibchannel.cpp
@@ -23,7 +23,7 @@
  *
  */
 
-#include "common/stdafx.h"
+
 #include "common/endian.h"
 #include "common/util.h"
 #include "sky/music/adlibchannel.h"
@@ -158,7 +158,7 @@ uint8 AdlibChannel::process(uint16 aktTime) {
 				case 8: com90_loopMusic(); break;
 				case 9: com90_keyOff(); break;
 				case 12: com90_setLoopPoint(); break;
-				
+
 				default:
 					error("AdlibChannel: Unknown music opcode 0x%02X", opcode);
 					break;
diff --git a/engines/sky/music/adlibmusic.cpp b/engines/sky/music/adlibmusic.cpp
index 03588f1fca..7c2b262d82 100644
--- a/engines/sky/music/adlibmusic.cpp
+++ b/engines/sky/music/adlibmusic.cpp
@@ -23,7 +23,7 @@
  *
  */
 
-#include "common/stdafx.h"
+
 #include "common/endian.h"
 
 #include "sky/music/adlibmusic.h"
@@ -122,16 +122,16 @@ void AdlibMusic::setVolume(uint16 param) {
 	_mixer->setVolumeForSoundType(Audio::Mixer::kMusicSoundType, 2 * param);
 }
 
-bool AdlibMusic::isStereo(void) const { 
-	return false; 
+bool AdlibMusic::isStereo(void) const {
+	return false;
 }
 
 bool AdlibMusic::endOfData(void) const {
-	return false; 
+	return false;
 }
 
-int AdlibMusic::getRate(void) const { 
-	return _sampleRate; 
+int AdlibMusic::getRate(void) const {
+	return _sampleRate;
 }
 
 } // End of namespace Sky
diff --git a/engines/sky/music/musicbase.h b/engines/sky/music/musicbase.h
index 40556e7e8a..ecb369c217 100644
--- a/engines/sky/music/musicbase.h
+++ b/engines/sky/music/musicbase.h
@@ -26,7 +26,7 @@
 #ifndef SKY_MUSIC_MUSICBASE_H
 #define SKY_MUSIC_MUSICBASE_H
 
-#include "common/stdafx.h"
+
 #include "common/scummsys.h"
 #include "common/mutex.h"
 
diff --git a/engines/sky/rnc_deco.cpp b/engines/sky/rnc_deco.cpp
index c87968b521..eb8307764d 100644
--- a/engines/sky/rnc_deco.cpp
+++ b/engines/sky/rnc_deco.cpp
@@ -23,7 +23,7 @@
  *
  */
 
-#include "common/stdafx.h"
+
 #include "common/endian.h"
 #include "sky/rnc_deco.h"
 
diff --git a/engines/sky/rnc_deco.h b/engines/sky/rnc_deco.h
index 89bdf83f45..38429383a3 100644
--- a/engines/sky/rnc_deco.h
+++ b/engines/sky/rnc_deco.h
@@ -26,7 +26,7 @@
 #ifndef SKY_RNC_DECO_H
 #define SKY_RNC_DECO_H
 
-#include "common/stdafx.h"
+
 
 #define RNC_SIGNATURE   0x524E4301 // "RNC\001"
 
diff --git a/engines/sky/screen.cpp b/engines/sky/screen.cpp
index cd99515d06..dab1724286 100644
--- a/engines/sky/screen.cpp
+++ b/engines/sky/screen.cpp
@@ -23,7 +23,7 @@
  *
  */
 
-#include "common/stdafx.h"
+
 #include "common/endian.h"
 #include "common/events.h"
 #include "common/system.h"
diff --git a/engines/sky/screen.h b/engines/sky/screen.h
index f3fdda2506..cbe38fbe38 100644
--- a/engines/sky/screen.h
+++ b/engines/sky/screen.h
@@ -26,7 +26,7 @@
 #ifndef SKY_SCREEN_H
 #define SKY_SCREEN_H
 
-#include "common/stdafx.h"
+
 #include "common/scummsys.h"
 #include "sky/skydefs.h"
 
diff --git a/engines/sky/sky.cpp b/engines/sky/sky.cpp
index 1ff23dbd07..11be2222ae 100644
--- a/engines/sky/sky.cpp
+++ b/engines/sky/sky.cpp
@@ -23,7 +23,7 @@
  *
  */
 
-#include "common/stdafx.h"
+
 
 #include "base/plugins.h"
 
diff --git a/engines/sky/sky.h b/engines/sky/sky.h
index 002964d6bb..b5d1701930 100644
--- a/engines/sky/sky.h
+++ b/engines/sky/sky.h
@@ -26,7 +26,7 @@
 #ifndef SKY_H
 #define SKY_H
 
-#include "common/stdafx.h"
+
 #include "common/events.h"
 #include "engines/engine.h"
 
diff --git a/engines/sky/skydefs.h b/engines/sky/skydefs.h
index 49e717737c..f4be91b3d1 100644
--- a/engines/sky/skydefs.h
+++ b/engines/sky/skydefs.h
@@ -26,7 +26,7 @@
 #ifndef SKY_DEFS_H
 #define SKY_DEFS_H
 
-#include "common/stdafx.h"
+
 
 namespace Sky {
 
diff --git a/engines/sky/sound.cpp b/engines/sky/sound.cpp
index c0dc227718..102d041643 100644
--- a/engines/sky/sound.cpp
+++ b/engines/sky/sound.cpp
@@ -23,7 +23,7 @@
  *
  */
 
-#include "common/stdafx.h"
+
 #include "common/endian.h"
 
 #include "sky/disk.h"
@@ -1110,7 +1110,7 @@ void Sound::playSound(uint16 sound, uint16 volume, uint8 channel) {
 	uint32 dataSize = READ_BE_UINT16(_sfxInfo + (sound << 3) + 2);
 	uint32 dataLoop = READ_BE_UINT16(_sfxInfo + (sound << 3) + 6);
 	dataOfs += _sfxBaseOfs;
-	
+
 	byte flags = Audio::Mixer::FLAG_UNSIGNED;
 
 	uint32 loopSta = 0, loopEnd = 0;
diff --git a/engines/sky/sound.h b/engines/sky/sound.h
index c5f9011499..28e2e8c88a 100644
--- a/engines/sky/sound.h
+++ b/engines/sky/sound.h
@@ -26,7 +26,7 @@
 #ifndef SKY_SOUND_H
 #define SKY_SOUND_H
 
-#include "common/stdafx.h"
+
 #include "common/scummsys.h"
 #include "sound/mixer.h"
 
diff --git a/engines/sky/text.cpp b/engines/sky/text.cpp
index 3b7d2feb72..19080d8ff9 100644
--- a/engines/sky/text.cpp
+++ b/engines/sky/text.cpp
@@ -23,7 +23,7 @@
  *
  */
 
-#include "common/stdafx.h"
+
 #include "common/endian.h"
 
 #include "sky/disk.h"
diff --git a/engines/sky/text.h b/engines/sky/text.h
index dd73b51db4..14c6936d38 100644
--- a/engines/sky/text.h
+++ b/engines/sky/text.h
@@ -26,7 +26,7 @@
 #ifndef SKY_TEXT_H
 #define SKY_TEXT_H
 
-#include "common/stdafx.h"
+
 #include "common/scummsys.h"
 
 namespace Sky {
@@ -61,7 +61,7 @@ public:
 	void logicCursor(Compact *textCompact, uint16 mouseX, uint16 mouseY);
 	void changeTextSpriteColour(uint8 *sprData, uint8 newCol);
 	uint32 giveCurrentCharSet(void);
-	
+
 	uint32 _numLetters;	//no of chars in message
 
 private: