aboutsummaryrefslogtreecommitdiff
path: root/engines/sword2
diff options
context:
space:
mode:
authorNicola Mettifogo2007-09-19 08:40:12 +0000
committerNicola Mettifogo2007-09-19 08:40:12 +0000
commit258901bab96f0050385a9912c8ea0fe2a41b2d6f (patch)
treea3ae8675b679c9f3b58ac8d97c79369502ea23c1 /engines/sword2
parenta89694c0d61a75a960f5bec6c498659c988401cc (diff)
downloadscummvm-rg350-258901bab96f0050385a9912c8ea0fe2a41b2d6f.tar.gz
scummvm-rg350-258901bab96f0050385a9912c8ea0fe2a41b2d6f.tar.bz2
scummvm-rg350-258901bab96f0050385a9912c8ea0fe2a41b2d6f.zip
Merged common/stdafx.h into common/scummsys.h. All referencing files have been updated.
svn-id: r28966
Diffstat (limited to 'engines/sword2')
-rw-r--r--engines/sword2/animation.cpp2
-rw-r--r--engines/sword2/anims.cpp2
-rw-r--r--engines/sword2/console.cpp2
-rw-r--r--engines/sword2/controls.cpp2
-rw-r--r--engines/sword2/debug.cpp2
-rw-r--r--engines/sword2/events.cpp2
-rw-r--r--engines/sword2/function.cpp2
-rw-r--r--engines/sword2/icons.cpp2
-rw-r--r--engines/sword2/interpreter.cpp2
-rw-r--r--engines/sword2/layers.cpp2
-rw-r--r--engines/sword2/logic.cpp4
-rw-r--r--engines/sword2/maketext.cpp2
-rw-r--r--engines/sword2/memory.cpp2
-rw-r--r--engines/sword2/menu.cpp2
-rw-r--r--engines/sword2/mouse.cpp2
-rw-r--r--engines/sword2/music.cpp4
-rw-r--r--engines/sword2/palette.cpp2
-rw-r--r--engines/sword2/protocol.cpp2
-rw-r--r--engines/sword2/render.cpp2
-rw-r--r--engines/sword2/resman.cpp4
-rw-r--r--engines/sword2/router.cpp2
-rw-r--r--engines/sword2/saveload.cpp2
-rw-r--r--engines/sword2/screen.cpp2
-rw-r--r--engines/sword2/scroll.cpp2
-rw-r--r--engines/sword2/sound.cpp2
-rw-r--r--engines/sword2/speech.cpp2
-rw-r--r--engines/sword2/sprite.cpp2
-rw-r--r--engines/sword2/startup.cpp2
-rw-r--r--engines/sword2/sword2.cpp6
-rw-r--r--engines/sword2/sync.cpp2
-rw-r--r--engines/sword2/walker.cpp2
31 files changed, 36 insertions, 36 deletions
diff --git a/engines/sword2/animation.cpp b/engines/sword2/animation.cpp
index 12998e5e6d..082d02a88f 100644
--- a/engines/sword2/animation.cpp
+++ b/engines/sword2/animation.cpp
@@ -25,7 +25,7 @@
* $Id$
*/
-#include "common/stdafx.h"
+
#include "common/config-manager.h"
#include "common/file.h"
#include "common/events.h"
diff --git a/engines/sword2/anims.cpp b/engines/sword2/anims.cpp
index 1878b1d6f1..1bf3967047 100644
--- a/engines/sword2/anims.cpp
+++ b/engines/sword2/anims.cpp
@@ -31,7 +31,7 @@
// DON'T TOUCH!
// ---------------------------------------------------------------------------
-#include "common/stdafx.h"
+
#include "common/file.h"
#include "sword2/sword2.h"
diff --git a/engines/sword2/console.cpp b/engines/sword2/console.cpp
index 1fae963ee8..3d2b89df55 100644
--- a/engines/sword2/console.cpp
+++ b/engines/sword2/console.cpp
@@ -25,7 +25,7 @@
* $Id$
*/
-#include "common/stdafx.h"
+
#include "common/rect.h"
#include "common/system.h"
diff --git a/engines/sword2/controls.cpp b/engines/sword2/controls.cpp
index 84580c7520..6b466d6be0 100644
--- a/engines/sword2/controls.cpp
+++ b/engines/sword2/controls.cpp
@@ -25,7 +25,7 @@
* $Id$
*/
-#include "common/stdafx.h"
+
#include "common/events.h"
#include "common/rect.h"
#include "common/config-manager.h"
diff --git a/engines/sword2/debug.cpp b/engines/sword2/debug.cpp
index f1f93c4731..e6662a4ef7 100644
--- a/engines/sword2/debug.cpp
+++ b/engines/sword2/debug.cpp
@@ -25,7 +25,7 @@
* $Id$
*/
-#include "common/stdafx.h"
+
#include "common/rect.h"
#include "sword2/sword2.h"
diff --git a/engines/sword2/events.cpp b/engines/sword2/events.cpp
index 4a2838795c..f0e0e567a4 100644
--- a/engines/sword2/events.cpp
+++ b/engines/sword2/events.cpp
@@ -25,7 +25,7 @@
* $Id$
*/
-#include "common/stdafx.h"
+
#include "sword2/sword2.h"
#include "sword2/defs.h"
diff --git a/engines/sword2/function.cpp b/engines/sword2/function.cpp
index 188ddd4d9b..917d47d7a2 100644
--- a/engines/sword2/function.cpp
+++ b/engines/sword2/function.cpp
@@ -25,7 +25,7 @@
* $Id$
*/
-#include "common/stdafx.h"
+
#include "common/system.h"
#include "common/file.h"
diff --git a/engines/sword2/icons.cpp b/engines/sword2/icons.cpp
index 13f211d7a0..5ecad3b8f7 100644
--- a/engines/sword2/icons.cpp
+++ b/engines/sword2/icons.cpp
@@ -25,7 +25,7 @@
* $Id$
*/
-#include "common/stdafx.h"
+
#include "common/stream.h"
#include "common/rect.h"
diff --git a/engines/sword2/interpreter.cpp b/engines/sword2/interpreter.cpp
index 605f1625fa..d3f202211d 100644
--- a/engines/sword2/interpreter.cpp
+++ b/engines/sword2/interpreter.cpp
@@ -25,7 +25,7 @@
* $Id$
*/
-#include "common/stdafx.h"
+
#include "common/util.h"
#include "sword2/sword2.h"
diff --git a/engines/sword2/layers.cpp b/engines/sword2/layers.cpp
index 2b5f215b7a..34ee395f16 100644
--- a/engines/sword2/layers.cpp
+++ b/engines/sword2/layers.cpp
@@ -33,7 +33,7 @@
// 3 normal sorted layers
// up to 2 foreground parallax layers
-#include "common/stdafx.h"
+
#include "common/rect.h"
#include "sword2/sword2.h"
diff --git a/engines/sword2/logic.cpp b/engines/sword2/logic.cpp
index 03a248450a..9ff7e6b45f 100644
--- a/engines/sword2/logic.cpp
+++ b/engines/sword2/logic.cpp
@@ -25,7 +25,7 @@
* $Id$
*/
-#include "common/stdafx.h"
+
#include "sword2/sword2.h"
#include "sword2/defs.h"
@@ -47,7 +47,7 @@ Logic::Logic(Sword2Engine *vm) :
memset(_eventList, 0, sizeof(_eventList));
memset(_syncList, 0, sizeof(_syncList));
_router = new Router(_vm);
-
+
setupOpcodes();
}
diff --git a/engines/sword2/maketext.cpp b/engines/sword2/maketext.cpp
index 324f7c19ca..65a98b8f32 100644
--- a/engines/sword2/maketext.cpp
+++ b/engines/sword2/maketext.cpp
@@ -43,7 +43,7 @@
// for new system by JEL on 9oct96 and updated again (for font
// as a resource) on 5dec96.
-#include "common/stdafx.h"
+
#include "common/system.h"
#include "sword2/sword2.h"
diff --git a/engines/sword2/memory.cpp b/engines/sword2/memory.cpp
index c3d0a7add6..5ca484343c 100644
--- a/engines/sword2/memory.cpp
+++ b/engines/sword2/memory.cpp
@@ -48,7 +48,7 @@
//
// The number zero is used to represent the NULL pointer.
-#include "common/stdafx.h"
+
#include "sword2/sword2.h"
#include "sword2/memory.h"
diff --git a/engines/sword2/menu.cpp b/engines/sword2/menu.cpp
index 2f93227bfa..41a2e34c8b 100644
--- a/engines/sword2/menu.cpp
+++ b/engines/sword2/menu.cpp
@@ -25,7 +25,7 @@
* $Id$
*/
-#include "common/stdafx.h"
+
#include "common/rect.h"
#include "sword2/sword2.h"
diff --git a/engines/sword2/mouse.cpp b/engines/sword2/mouse.cpp
index 46cc5372a1..b6d435c45b 100644
--- a/engines/sword2/mouse.cpp
+++ b/engines/sword2/mouse.cpp
@@ -25,7 +25,7 @@
* $Id$
*/
-#include "common/stdafx.h"
+
#include "common/system.h"
#include "common/events.h"
diff --git a/engines/sword2/music.cpp b/engines/sword2/music.cpp
index c2374dad9f..54a6474cd0 100644
--- a/engines/sword2/music.cpp
+++ b/engines/sword2/music.cpp
@@ -31,7 +31,7 @@
//
// All things considered, I think this is more bother than it's worth.
-#include "common/stdafx.h"
+
#include "common/file.h"
#include "common/system.h"
@@ -139,7 +139,7 @@ static Audio::AudioStream *getAudioStream(SoundFileHandle *fh, const char *base,
}
fh->file.seek(pos, SEEK_SET);
-
+
Common::MemoryReadStream *tmp = 0;
switch (fh->fileType) {
diff --git a/engines/sword2/palette.cpp b/engines/sword2/palette.cpp
index dcc519cdce..127340ea89 100644
--- a/engines/sword2/palette.cpp
+++ b/engines/sword2/palette.cpp
@@ -25,7 +25,7 @@
* $Id$
*/
-#include "common/stdafx.h"
+
#include "common/system.h"
#include "sword2/sword2.h"
diff --git a/engines/sword2/protocol.cpp b/engines/sword2/protocol.cpp
index e4992c27c7..65b236e2db 100644
--- a/engines/sword2/protocol.cpp
+++ b/engines/sword2/protocol.cpp
@@ -25,7 +25,7 @@
* $Id$
*/
-#include "common/stdafx.h"
+
#include "sword2/sword2.h"
#include "sword2/header.h"
diff --git a/engines/sword2/render.cpp b/engines/sword2/render.cpp
index dafef6de00..f5464efd4b 100644
--- a/engines/sword2/render.cpp
+++ b/engines/sword2/render.cpp
@@ -25,7 +25,7 @@
* $Id$
*/
-#include "common/stdafx.h"
+
#include "common/endian.h"
#include "common/system.h"
diff --git a/engines/sword2/resman.cpp b/engines/sword2/resman.cpp
index e8c5fcf42a..46637dd4ef 100644
--- a/engines/sword2/resman.cpp
+++ b/engines/sword2/resman.cpp
@@ -25,7 +25,7 @@
* $Id$
*/
-#include "common/stdafx.h"
+
#include "common/file.h"
#include "common/system.h"
@@ -89,7 +89,7 @@ ResourceManager::~ResourceManager() {
free(_resConvTable);
}
-
+
bool ResourceManager::init() {
uint32 i, j;
diff --git a/engines/sword2/router.cpp b/engines/sword2/router.cpp
index b05f2ae0e5..6be155dd85 100644
--- a/engines/sword2/router.cpp
+++ b/engines/sword2/router.cpp
@@ -25,7 +25,7 @@
* $Id$
*/
-#include "common/stdafx.h"
+
#include "common/stream.h"
#include "sword2/sword2.h"
diff --git a/engines/sword2/saveload.cpp b/engines/sword2/saveload.cpp
index 9d6826f1a0..c08ef99996 100644
--- a/engines/sword2/saveload.cpp
+++ b/engines/sword2/saveload.cpp
@@ -34,7 +34,7 @@
//
// ---------------------------------------------------------------------------
-#include "common/stdafx.h"
+
#include "common/savefile.h"
#include "sword2/sword2.h"
diff --git a/engines/sword2/screen.cpp b/engines/sword2/screen.cpp
index 0a1b45d2de..d4d286c018 100644
--- a/engines/sword2/screen.cpp
+++ b/engines/sword2/screen.cpp
@@ -29,7 +29,7 @@
// BUILD_DISPLAY.CPP like the old spr_engi but slightly more aptly named
// ---------------------------------------------------------------------------
-#include "common/stdafx.h"
+
#include "common/system.h"
#include "common/events.h"
diff --git a/engines/sword2/scroll.cpp b/engines/sword2/scroll.cpp
index 7df70c8019..eb080eb4b3 100644
--- a/engines/sword2/scroll.cpp
+++ b/engines/sword2/scroll.cpp
@@ -25,7 +25,7 @@
* $Id$
*/
-#include "common/stdafx.h"
+
#include "sword2/sword2.h"
#include "sword2/defs.h"
diff --git a/engines/sword2/sound.cpp b/engines/sword2/sound.cpp
index 04b3e55098..6af94c9cb6 100644
--- a/engines/sword2/sound.cpp
+++ b/engines/sword2/sound.cpp
@@ -35,7 +35,7 @@
//
// ---------------------------------------------------------------------------
-#include "common/stdafx.h"
+
#include "common/file.h"
#include "common/system.h"
diff --git a/engines/sword2/speech.cpp b/engines/sword2/speech.cpp
index 0e8aa70538..b6f77dde74 100644
--- a/engines/sword2/speech.cpp
+++ b/engines/sword2/speech.cpp
@@ -25,7 +25,7 @@
* $Id$
*/
-#include "common/stdafx.h"
+
#include "common/file.h"
#include "sword2/sword2.h"
diff --git a/engines/sword2/sprite.cpp b/engines/sword2/sprite.cpp
index 9aa3bfff9b..e6f17a1af1 100644
--- a/engines/sword2/sprite.cpp
+++ b/engines/sword2/sprite.cpp
@@ -25,7 +25,7 @@
* $Id$
*/
-#include "common/stdafx.h"
+
#include "sword2/sword2.h"
#include "sword2/defs.h"
diff --git a/engines/sword2/startup.cpp b/engines/sword2/startup.cpp
index 870a13fd46..1841384897 100644
--- a/engines/sword2/startup.cpp
+++ b/engines/sword2/startup.cpp
@@ -25,7 +25,7 @@
* $Id$
*/
-#include "common/stdafx.h"
+
#include "common/file.h"
#include "sword2/sword2.h"
diff --git a/engines/sword2/sword2.cpp b/engines/sword2/sword2.cpp
index 6bbd58ff3c..372fc79214 100644
--- a/engines/sword2/sword2.cpp
+++ b/engines/sword2/sword2.cpp
@@ -25,7 +25,7 @@
* $Id$
*/
-#include "common/stdafx.h"
+
#include "base/plugins.h"
@@ -112,7 +112,7 @@ GameList Engine_SWORD2_detectGames(const FSList &fslist) {
}
}
-
+
if (detectedGames.empty()) {
// Nothing found -- try to recurse into the 'clusters' subdirectory,
// present e.g. if the user copied the data straight from CD.
@@ -179,7 +179,7 @@ Sword2Engine::Sword2Engine(OSystem *syst) : Engine(syst) {
_features = GF_DEMO;
else
_features = 0;
-
+
_bootParam = ConfMan.getInt("boot_param");
_saveSlot = ConfMan.getInt("save_slot");
diff --git a/engines/sword2/sync.cpp b/engines/sword2/sync.cpp
index 57e857b6ed..1adc652b75 100644
--- a/engines/sword2/sync.cpp
+++ b/engines/sword2/sync.cpp
@@ -25,7 +25,7 @@
* $Id$
*/
-#include "common/stdafx.h"
+
#include "sword2/sword2.h"
#include "sword2/defs.h"
diff --git a/engines/sword2/walker.cpp b/engines/sword2/walker.cpp
index 4db69474d9..7971299818 100644
--- a/engines/sword2/walker.cpp
+++ b/engines/sword2/walker.cpp
@@ -29,7 +29,7 @@
// Functions for moving megas about the place & also for keeping tabs on them
-#include "common/stdafx.h"
+
#include "sword2/sword2.h"
#include "sword2/defs.h"