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

svn-id: r28966

16 files changed, 44 insertions, 44 deletions

diff --git a/engines/scumm/he/animation_he.cpp b/engines/scumm/he/animation_he.cpp
index 3c7d742ba2..24badd2685 100644
--- a/engines/scumm/he/animation_he.cpp
+++ b/engines/scumm/he/animation_he.cpp
@@ -23,7 +23,7 @@
  *
  */
 
-#include "common/stdafx.h"
+
 
 #include "scumm/he/animation_he.h"
 #include "scumm/he/intern_he.h"
@@ -58,11 +58,11 @@ int MoviePlayer::load(const char *filename, int flags, int image) {
 
 	// Change file extension to dxa
 	sprintf(videoName, "%s.dxa", baseName);
-	
+
 	if (!loadFile(videoName)) {
 		warning("Failed to load video file %s", videoName);
 		return -1;
-	} 
+	}
 	debug(1, "Playing video %s", videoName);
 
 	// Skip sound tag
@@ -101,7 +101,7 @@ void MoviePlayer::handleNextFrame() {
 		copyFrameToBuffer(dst, 0, 0, _vm->_screenWidth);
 	} else if (_flags & 1) {
 		copyFrameToBuffer(pvs->getBackPixels(0, 0), 0, 0, _vm->_screenWidth);
-		
+
 		Common::Rect imageRect(_width, _height);
 		_vm->restoreBackgroundHE(imageRect);
 	} else {
diff --git a/engines/scumm/he/cup_player_he.cpp b/engines/scumm/he/cup_player_he.cpp
index 737e2772ff..e611c85e9d 100644
--- a/engines/scumm/he/cup_player_he.cpp
+++ b/engines/scumm/he/cup_player_he.cpp
@@ -23,7 +23,7 @@
  *
  */
 
-#include "common/stdafx.h"
+
 #include "common/system.h"
 #include "sound/audiostream.h"
 #include "sound/mixer.h"
diff --git a/engines/scumm/he/floodfill_he.cpp b/engines/scumm/he/floodfill_he.cpp
index ea2043d69f..4fdfe139fc 100644
--- a/engines/scumm/he/floodfill_he.cpp
+++ b/engines/scumm/he/floodfill_he.cpp
@@ -23,7 +23,7 @@
  *
  */
 
-#include "common/stdafx.h"
+
 
 #include "scumm/he/floodfill_he.h"
 #include "scumm/he/intern_he.h"
@@ -31,7 +31,7 @@
 #include "scumm/scumm.h"
 
 namespace Scumm {
-	
+
 static bool floodFillPixelCheck(int x, int y, const FloodFillState *ffs) {
 	int diffColor = ffs->color1 - ffs->color2;
 	if (x >= 0 && x < ffs->dst_w && y >= 0 && y < ffs->dst_h) {
@@ -81,10 +81,10 @@ static void floodFillAddLine(FloodFillLine **ffl, int y, int x1, int x2, int dy)
 static void floodFillProcess(int x, int y, FloodFillState *ffs, FloodFillPixelCheckCallback pixelCheckCallback) {
 	ffs->dstBox.left = ffs->dstBox.top = 12345;
 	ffs->dstBox.right = ffs->dstBox.bottom = -12345;
-	
+
 	FloodFillLine **fillLineCur = &ffs->fillLineTableCur;
 	FloodFillLine **fillLineEnd = &ffs->fillLineTableEnd;
-	
+
 	assert(*fillLineCur < *fillLineEnd);
 	if (ffs->srcBox.top <= y + 1 && ffs->srcBox.bottom >= y + 1) {
 		(*fillLineCur)->y = y;
@@ -93,7 +93,7 @@ static void floodFillProcess(int x, int y, FloodFillState *ffs, FloodFillPixelCh
 		(*fillLineCur)->inc = 1;
 		(*fillLineCur)++;
 	}
-	
+
 	assert(*fillLineCur < *fillLineEnd);
 	if (ffs->srcBox.top <= y && ffs->srcBox.bottom >= y) {
 		(*fillLineCur)->y = y + 1;
@@ -105,7 +105,7 @@ static void floodFillProcess(int x, int y, FloodFillState *ffs, FloodFillPixelCh
 
 	assert(ffs->fillLineTable <= *fillLineCur);
 	FloodFillLine **fillLineStart = fillLineCur;
-	
+
 	while (ffs->fillLineTable < *fillLineStart) {
 		Common::Rect r;
 		int x_start;
@@ -190,7 +190,7 @@ void floodFill(FloodFillParameters *ffp, ScummEngine_v90he *vm) {
 	Common::Rect r;
 	r.left = r.top = 12345;
 	r.right = r.bottom = -12345;
-	
+
 	FloodFillState *ffs = new FloodFillState;
 	ffs->fillLineTableCount = vs->h * 2;
 	ffs->fillLineTable = new FloodFillLine[ffs->fillLineTableCount];
@@ -201,25 +201,25 @@ void floodFill(FloodFillParameters *ffp, ScummEngine_v90he *vm) {
 	ffs->srcBox = ffp->box;
 	ffs->fillLineTableCur = &ffs->fillLineTable[0];
 	ffs->fillLineTableEnd = &ffs->fillLineTable[ffs->fillLineTableCount];
-	
+
 	if (ffp->x < 0 || ffp->y < 0 || ffp->x >= vs->w || ffp->y >= vs->h) {
 		ffs->color1 = color;
 	} else {
 		ffs->color1 = *(dst + ffp->y * vs->w + ffp->x);
 	}
-	
+
 	debug(5, "floodFill() x=%d y=%d color1=%d ffp->flags=0x%X", ffp->x, ffp->y, ffs->color1, ffp->flags);
 	if (ffs->color1 != color) {
 		floodFillProcess(ffp->x, ffp->y, ffs, floodFillPixelCheck);
 		r = ffs->dstBox;
 	}
 	r.debugPrint(5, "floodFill() dirty_rect");
-	
+
 	delete[] ffs->fillLineTable;
 	delete ffs;
-	
+
 	vm->VAR(119) = 1;
-	
+
 	if (r.left <= r.right && r.top <= r.bottom) {
 		if (ffp->flags & 0x8000) {
 			vm->restoreBackgroundHE(r);
@@ -271,19 +271,19 @@ void Wiz::fillWizFlood(const WizParameters *params) {
 				ffs->srcBox = imageRect;
 				ffs->fillLineTableCur = &ffs->fillLineTable[0];
 				ffs->fillLineTableEnd = &ffs->fillLineTable[ffs->fillLineTableCount];
-	
+
 				if (px < 0 || py < 0 || px >= w || py >= h) {
 					ffs->color1 = color;
 				} else {
 					ffs->color1 = *(wizd + py * w + px);
 				}
-	
+
 				debug(0, "floodFill() x=%d y=%d color1=%d", px, py, ffs->color1);
 
 				if (ffs->color1 != color) {
 					floodFillProcess(px, py, ffs, floodFillPixelCheck);
 				}
-	
+
 				delete[] ffs->fillLineTable;
 				delete ffs;
 			}
diff --git a/engines/scumm/he/logic_he.cpp b/engines/scumm/he/logic_he.cpp
index 7a0869ad24..49acde9465 100644
--- a/engines/scumm/he/logic_he.cpp
+++ b/engines/scumm/he/logic_he.cpp
@@ -23,7 +23,7 @@
  *
  */
 
-#include "common/stdafx.h"
+
 
 #include "scumm/he/intern_he.h"
 #include "scumm/he/logic_he.h"
diff --git a/engines/scumm/he/logic_he.h b/engines/scumm/he/logic_he.h
index af5457295b..4f850e0f32 100644
--- a/engines/scumm/he/logic_he.h
+++ b/engines/scumm/he/logic_he.h
@@ -26,7 +26,7 @@
 #if !defined(SCUMM_HE_LOGIC_HE_H) && !defined(DISABLE_HE)
 #define SCUMM_HE_LOGIC_HE_H
 
-#include "common/stdafx.h"
+
 
 namespace Scumm {
 
diff --git a/engines/scumm/he/palette_he.cpp b/engines/scumm/he/palette_he.cpp
index 9efc16c60b..aac7bb5848 100644
--- a/engines/scumm/he/palette_he.cpp
+++ b/engines/scumm/he/palette_he.cpp
@@ -22,7 +22,7 @@
  *
  */
 
-#include "common/stdafx.h"
+
 #include "common/system.h"
 #include "scumm/scumm.h"
 #include "scumm/he/intern_he.h"
diff --git a/engines/scumm/he/resource_he.cpp b/engines/scumm/he/resource_he.cpp
index 651c150cee..9bebd7a47d 100644
--- a/engines/scumm/he/resource_he.cpp
+++ b/engines/scumm/he/resource_he.cpp
@@ -23,7 +23,7 @@
  *
  */
 
-#include "common/stdafx.h"
+
 #include "scumm/scumm.h"
 #include "scumm/file.h"
 #include "scumm/he/intern_he.h"
@@ -668,7 +668,7 @@ bool Win32ResExtractor::read_library(WinLibrary *fi) {
 		DOSImageHeader *mz_header = MZ_HEADER(fi->memory);
 
 		RETURN_IF_BAD_POINTER(false, mz_header->lfanew);
-		
+
 		// Apply endian fix (currently only lfanew is used from the DOSImageHeader,
 		// so we don't bother to 'fix' the rest).
 		LE32(mz_header->lfanew);
@@ -726,7 +726,7 @@ bool Win32ResExtractor::read_library(WinLibrary *fi) {
 			error("%s: file contains no resources", fi->file->name());
 			return false;
 		}
-		
+
 		fix_win32_image_data_directory(dir);
 
 		fi->first_resource = fi->memory + dir->virtual_address;
@@ -1154,7 +1154,7 @@ int MacResExtractor::extractResource(int id, byte **buf) {
 		// Some programs write it as .bin. Try that too
 		if (!in.open(_fileName)) {
 			Common::String tmp(_fileName);
-			
+
 			_fileName += ".bin";
 
 			if (!in.open(_fileName)) {
@@ -1749,7 +1749,7 @@ void ScummEngine_v80he::createSound(int snd1id, int snd2id) {
 		src = sdat2Ptr + 8;
 		dst = sdat1Ptr + 8 + _sndPtrOffs;
 		len = sdat2size;
-		
+
 		memcpy(dst, src, len);
 
 		_sndPtrOffs += sdat2size;
@@ -1758,14 +1758,14 @@ void ScummEngine_v80he::createSound(int snd1id, int snd2id) {
 		src = sdat2Ptr + 8;
 		dst = sdat1Ptr + 8 + _sndPtrOffs;
 		len = sdat1size;
-		
+
 		memcpy(dst, src, len);
 
 		if (sdat2size != sdat1size) {
 			src = sdat2Ptr + 8 + sdat1size;
 			dst = sdat1Ptr + 8;
 			len = sdat2size - sdat1size;
-		
+
 			memcpy(dst, src, len);
 		}
 
diff --git a/engines/scumm/he/script_v100he.cpp b/engines/scumm/he/script_v100he.cpp
index e234dd02fc..273f6c6920 100644
--- a/engines/scumm/he/script_v100he.cpp
+++ b/engines/scumm/he/script_v100he.cpp
@@ -23,7 +23,7 @@
  *
  */
 
-#include "common/stdafx.h"
+
 
 #include "common/system.h"
 
@@ -1681,7 +1681,7 @@ void ScummEngine_v100he::o100_setSystemMessage() {
 		// behavior can occur, from strange wrong titles, up to crashes (happens
 		// under Mac OS X).
 		//
-		// Possible fixes/workarounds: 
+		// Possible fixes/workarounds:
 		// - Simply stop using this. It's a rather unimportant "feature" anyway.
 		// - Try to translate the text to ASCII.
 		// - Refine OSystem to accept window captions that are non-ASCII, e.g.
diff --git a/engines/scumm/he/script_v60he.cpp b/engines/scumm/he/script_v60he.cpp
index 0b9c94fe18..2909a44223 100644
--- a/engines/scumm/he/script_v60he.cpp
+++ b/engines/scumm/he/script_v60he.cpp
@@ -23,7 +23,7 @@
  *
  */
 
-#include "common/stdafx.h"
+
 #include "common/savefile.h"
 
 #include "scumm/actor.h"
diff --git a/engines/scumm/he/script_v70he.cpp b/engines/scumm/he/script_v70he.cpp
index 1ced349225..b2009452b4 100644
--- a/engines/scumm/he/script_v70he.cpp
+++ b/engines/scumm/he/script_v70he.cpp
@@ -23,7 +23,7 @@
  *
  */
 
-#include "common/stdafx.h"
+
 
 #include "common/config-manager.h"
 #include "common/system.h"
@@ -1105,7 +1105,7 @@ void ScummEngine_v70he::o70_setSystemMessage() {
 		// behavior can occur, from strange wrong titles, up to crashes (happens
 		// under Mac OS X).
 		//
-		// Possible fixes/workarounds: 
+		// Possible fixes/workarounds:
 		// - Simply stop using this. It's a rather unimportant "feature" anyway.
 		// - Try to translate the text to ASCII.
 		// - Refine OSystem to accept window captions that are non-ASCII, e.g.
diff --git a/engines/scumm/he/script_v72he.cpp b/engines/scumm/he/script_v72he.cpp
index 8953d55546..5db2ae74ec 100644
--- a/engines/scumm/he/script_v72he.cpp
+++ b/engines/scumm/he/script_v72he.cpp
@@ -23,7 +23,7 @@
  *
  */
 
-#include "common/stdafx.h"
+
 
 #include "common/config-manager.h"
 #include "common/savefile.h"
@@ -2256,7 +2256,7 @@ void ScummEngine_v72he::o72_setSystemMessage() {
 		// behavior can occur, from strange wrong titles, up to crashes (happens
 		// under Mac OS X).
 		//
-		// Possible fixes/workarounds: 
+		// Possible fixes/workarounds:
 		// - Simply stop using this. It's a rather unimportant "feature" anyway.
 		// - Try to translate the text to ASCII.
 		// - Refine OSystem to accept window captions that are non-ASCII, e.g.
diff --git a/engines/scumm/he/script_v80he.cpp b/engines/scumm/he/script_v80he.cpp
index a62b65787c..d4a11240bd 100644
--- a/engines/scumm/he/script_v80he.cpp
+++ b/engines/scumm/he/script_v80he.cpp
@@ -23,7 +23,7 @@
  *
  */
 
-#include "common/stdafx.h"
+
 
 #include "common/config-file.h"
 #include "common/config-manager.h"
diff --git a/engines/scumm/he/script_v90he.cpp b/engines/scumm/he/script_v90he.cpp
index a717eecc50..e344db21be 100644
--- a/engines/scumm/he/script_v90he.cpp
+++ b/engines/scumm/he/script_v90he.cpp
@@ -23,7 +23,7 @@
  *
  */
 
-#include "common/stdafx.h"
+
 
 #include "scumm/actor.h"
 #include "scumm/charset.h"
diff --git a/engines/scumm/he/sound_he.cpp b/engines/scumm/he/sound_he.cpp
index d0a16390dd..b074f644e0 100644
--- a/engines/scumm/he/sound_he.cpp
+++ b/engines/scumm/he/sound_he.cpp
@@ -23,7 +23,7 @@
  *
  */
 
-#include "common/stdafx.h"
+
 #include "scumm/actor.h"
 #include "scumm/file.h"
 #include "scumm/imuse/imuse.h"
@@ -57,7 +57,7 @@ SoundHE::SoundHE(ScummEngine *parent, Audio::Mixer *mixer)
 	_heMusicTracks(0) {
 
 	memset(_heChannel, 0, sizeof(_heChannel));
-}	
+}
 
 SoundHE::~SoundHE() {
 	free(_heMusic);
@@ -81,7 +81,7 @@ void SoundHE::addSoundToQueue2(int sound, int heOffset, int heChannel, int heFla
 		if (_soundQue2[i].sound == sound && !(heFlags & 2))
 			return;
 	}
-	
+
 	Sound::addSoundToQueue2(sound, heOffset, heChannel, heFlags);
 }
 
diff --git a/engines/scumm/he/sprite_he.cpp b/engines/scumm/he/sprite_he.cpp
index 15698dedba..1e694ff067 100644
--- a/engines/scumm/he/sprite_he.cpp
+++ b/engines/scumm/he/sprite_he.cpp
@@ -23,7 +23,7 @@
  *
  */
 
-#include "common/stdafx.h"
+
 
 #include "scumm/he/intern_he.h"
 #include "scumm/resource.h"
diff --git a/engines/scumm/he/wiz_he.cpp b/engines/scumm/he/wiz_he.cpp
index a99f3b1ad5..97995fb155 100644
--- a/engines/scumm/he/wiz_he.cpp
+++ b/engines/scumm/he/wiz_he.cpp
@@ -23,7 +23,7 @@
  *
  */
 
-#include "common/stdafx.h"
+
 
 #include "common/system.h"
 #include "graphics/cursorman.h"