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

svn-id: r28966

19 files changed, 24 insertions, 23 deletions

diff --git a/engines/queen/bankman.cpp b/engines/queen/bankman.cpp
index f43af18285..69014096eb 100644
--- a/engines/queen/bankman.cpp
+++ b/engines/queen/bankman.cpp
@@ -23,7 +23,7 @@
  *
  */
 
-#include "common/stdafx.h"
+
 #include "queen/bankman.h"
 
 #include "queen/resource.h"
diff --git a/engines/queen/command.cpp b/engines/queen/command.cpp
index 4d1ec53e09..561c875628 100644
--- a/engines/queen/command.cpp
+++ b/engines/queen/command.cpp
@@ -23,7 +23,7 @@
  *
  */
 
-#include "common/stdafx.h"
+
 #include "common/events.h"
 #include "common/system.h"
 #include "queen/command.h"
diff --git a/engines/queen/credits.cpp b/engines/queen/credits.cpp
index 5e411f4408..5893d0e857 100644
--- a/engines/queen/credits.cpp
+++ b/engines/queen/credits.cpp
@@ -23,7 +23,7 @@
  *
  */
 
-#include "common/stdafx.h"
+
 #include "queen/credits.h"
 
 #include "queen/display.h"
diff --git a/engines/queen/cutaway.cpp b/engines/queen/cutaway.cpp
index 721d7bb318..1012740040 100644
--- a/engines/queen/cutaway.cpp
+++ b/engines/queen/cutaway.cpp
@@ -23,7 +23,7 @@
  *
  */
 
-#include "common/stdafx.h"
+
 #include "queen/cutaway.h"
 
 #include "queen/bankman.h"
diff --git a/engines/queen/debug.cpp b/engines/queen/debug.cpp
index 22481d377d..63b8432ee5 100644
--- a/engines/queen/debug.cpp
+++ b/engines/queen/debug.cpp
@@ -23,7 +23,8 @@
  *
  */
 
-#include "common/stdafx.h"
+#include "common/scummsys.h"
+
 #include "queen/debug.h"
 
 #include "queen/graphics.h"
diff --git a/engines/queen/display.cpp b/engines/queen/display.cpp
index 9c4101f1d3..11b1bb9da7 100644
--- a/engines/queen/display.cpp
+++ b/engines/queen/display.cpp
@@ -23,7 +23,7 @@
  *
  */
 
-#include "common/stdafx.h"
+
 #include "common/system.h"
 
 #include "graphics/cursorman.h"
diff --git a/engines/queen/graphics.cpp b/engines/queen/graphics.cpp
index 6199a75e7c..f863f7663c 100644
--- a/engines/queen/graphics.cpp
+++ b/engines/queen/graphics.cpp
@@ -23,7 +23,7 @@
  *
  */
 
-#include "common/stdafx.h"
+
 #include "queen/graphics.h"
 
 #include "queen/bankman.h"
diff --git a/engines/queen/grid.cpp b/engines/queen/grid.cpp
index be0871b71d..b1191c3bde 100644
--- a/engines/queen/grid.cpp
+++ b/engines/queen/grid.cpp
@@ -23,7 +23,7 @@
  *
  */
 
-#include "common/stdafx.h"
+
 #include "queen/grid.h"
 
 #include "queen/display.h"
diff --git a/engines/queen/input.cpp b/engines/queen/input.cpp
index 10a8664c0e..ba15aaf721 100644
--- a/engines/queen/input.cpp
+++ b/engines/queen/input.cpp
@@ -23,7 +23,7 @@
  *
  */
 
-#include "common/stdafx.h"
+
 #include "common/events.h"
 #include "common/system.h"
 
diff --git a/engines/queen/journal.cpp b/engines/queen/journal.cpp
index c75b03a5c0..739b78b0bc 100644
--- a/engines/queen/journal.cpp
+++ b/engines/queen/journal.cpp
@@ -23,7 +23,7 @@
  *
  */
 
-#include "common/stdafx.h"
+
 #include "common/events.h"
 #include "common/system.h"
 #include "queen/journal.h"
diff --git a/engines/queen/logic.cpp b/engines/queen/logic.cpp
index 1a196ddc09..fb1105084e 100644
--- a/engines/queen/logic.cpp
+++ b/engines/queen/logic.cpp
@@ -23,7 +23,7 @@
  *
  */
 
-#include "common/stdafx.h"
+
 #include "common/config-manager.h"
 #include "common/events.h"
 #include "common/system.h"
diff --git a/engines/queen/music.cpp b/engines/queen/music.cpp
index 7d37513a9f..e250a9b79c 100644
--- a/engines/queen/music.cpp
+++ b/engines/queen/music.cpp
@@ -23,7 +23,7 @@
  *
  */
 
-#include "common/stdafx.h"
+
 #include "queen/music.h"
 #include "queen/queen.h"
 #include "queen/resource.h"
diff --git a/engines/queen/musicdata.cpp b/engines/queen/musicdata.cpp
index a0b2a73697..57de971931 100644
--- a/engines/queen/musicdata.cpp
+++ b/engines/queen/musicdata.cpp
@@ -23,7 +23,7 @@
  *
  */
 
-#include "common/stdafx.h"
+
 #include "queen/sound.h"
 
 namespace Queen {
diff --git a/engines/queen/queen.cpp b/engines/queen/queen.cpp
index 0c024a9eb4..b17b473947 100644
--- a/engines/queen/queen.cpp
+++ b/engines/queen/queen.cpp
@@ -23,7 +23,7 @@
  *
  */
 
-#include "common/stdafx.h"
+
 
 #include "base/plugins.h"
 
@@ -328,17 +328,17 @@ void QueenEngine::findGameStateDescriptions(char descriptions[100][32]) {
 
 	memset(marks, false, SAVESTATE_MAX_NUM * sizeof(bool));	//assume no savegames for this title
 	filenames = _saveFileMan->listSavefiles(prefix);
-	
+
 	for (Common::StringList::const_iterator file = filenames.begin(); file != filenames.end(); file++){
 		//Obtain the last 2 digits of the filename, since they correspond to the save slot
 		slot[0] = file->c_str()[file->size()-2];
 		slot[1] = file->c_str()[file->size()-1];
-		
+
 		slotNum = atoi(slot);
 		if (slotNum >= 0 && slotNum < SAVESTATE_MAX_NUM)
 			marks[slotNum] = true;	//mark this slot as valid
 	}
-	
+
 	for (int i = 0; i < SAVESTATE_MAX_NUM; ++i) {
 		if (marks[i]) {
 			GameStateHeader header;
diff --git a/engines/queen/resource.cpp b/engines/queen/resource.cpp
index 20b047cb71..8e33051287 100644
--- a/engines/queen/resource.cpp
+++ b/engines/queen/resource.cpp
@@ -23,7 +23,7 @@
  *
  */
 
-#include "common/stdafx.h"
+
 #include "common/endian.h"
 #include "common/config-manager.h"
 #include "queen/resource.h"
diff --git a/engines/queen/sound.cpp b/engines/queen/sound.cpp
index 1da07cf97c..fffeaf5f1d 100644
--- a/engines/queen/sound.cpp
+++ b/engines/queen/sound.cpp
@@ -23,7 +23,7 @@
  *
  */
 
-#include "common/stdafx.h"
+
 #include "common/config-manager.h"
 #include "common/endian.h"
 #include "common/stream.h"
diff --git a/engines/queen/state.cpp b/engines/queen/state.cpp
index 273208718f..563df4c6fb 100644
--- a/engines/queen/state.cpp
+++ b/engines/queen/state.cpp
@@ -23,7 +23,7 @@
  *
  */
 
-#include "common/stdafx.h"
+
 #include "queen/state.h"
 
 namespace Queen {
diff --git a/engines/queen/talk.cpp b/engines/queen/talk.cpp
index 8396356685..5b741adaf8 100644
--- a/engines/queen/talk.cpp
+++ b/engines/queen/talk.cpp
@@ -23,7 +23,7 @@
  *
  */
 
-#include "common/stdafx.h"
+
 #include "common/events.h"
 #include "common/system.h"
 #include "common/rect.h"
diff --git a/engines/queen/walk.cpp b/engines/queen/walk.cpp
index 6943ca1214..eef2954d9a 100644
--- a/engines/queen/walk.cpp
+++ b/engines/queen/walk.cpp
@@ -23,7 +23,7 @@
  *
  */
 
-#include "common/stdafx.h"
+
 #include "queen/walk.h"
 
 #include "queen/bankman.h"
@@ -431,7 +431,7 @@ int16 Walk::calcC(int16 c1, int16 c2, int16 c3, int16 c4, int16 lastc) {
 }
 
 int16 Walk::findAreaPosition(int16 *x, int16 *y, bool recalibrate) {
-	// In order to locate the nearest available area, the original algorithm 
+	// In order to locate the nearest available area, the original algorithm
 	// computes the horizontal and vertical distances for each available area.
 	// Unlike the original, we also compute the diagonal distance.
 	// To get an example of this in action, in the room D1, make Joe walking