aboutsummaryrefslogtreecommitdiff
path: root/engines/scumm
diff options
context:
space:
mode:
authorMax Horn2006-09-23 00:42:35 +0000
committerMax Horn2006-09-23 00:42:35 +0000
commit4c14cf6d1a77857e3683a1029b42ddb96e1bc80b (patch)
tree09057bd88bd471c2603139cbb06abac53625f2e4 /engines/scumm
parenta3be69f4e4b1793c2ce1fe95d3d6db5ca3a7cf8b (diff)
downloadscummvm-rg350-4c14cf6d1a77857e3683a1029b42ddb96e1bc80b.tar.gz
scummvm-rg350-4c14cf6d1a77857e3683a1029b42ddb96e1bc80b.tar.bz2
scummvm-rg350-4c14cf6d1a77857e3683a1029b42ddb96e1bc80b.zip
Moved base/engine.cpp and .h to engines/ (main motivation: helps untangle the linker dependency graph). Porters will have to update project files
svn-id: r23974
Diffstat (limited to 'engines/scumm')
-rw-r--r--engines/scumm/imuse/imuse_player.cpp2
-rw-r--r--engines/scumm/insane/insane.cpp2
-rw-r--r--engines/scumm/insane/insane.h2
-rw-r--r--engines/scumm/insane/insane_ben.cpp2
-rw-r--r--engines/scumm/insane/insane_enemy.cpp2
-rw-r--r--engines/scumm/insane/insane_iact.cpp2
-rw-r--r--engines/scumm/insane/insane_scenes.cpp2
-rw-r--r--engines/scumm/player_nes.cpp2
-rw-r--r--engines/scumm/player_v1.cpp2
-rw-r--r--engines/scumm/player_v2.cpp2
-rw-r--r--engines/scumm/player_v2a.cpp2
-rw-r--r--engines/scumm/player_v3a.cpp2
-rw-r--r--engines/scumm/script.h2
-rw-r--r--engines/scumm/scumm.h2
-rw-r--r--engines/scumm/smush/smush_player.cpp2
15 files changed, 15 insertions, 15 deletions
diff --git a/engines/scumm/imuse/imuse_player.cpp b/engines/scumm/imuse/imuse_player.cpp
index a0c838beb7..c8a7e7365f 100644
--- a/engines/scumm/imuse/imuse_player.cpp
+++ b/engines/scumm/imuse/imuse_player.cpp
@@ -23,7 +23,7 @@
#include "common/stdafx.h"
#include "common/util.h"
-#include "base/engine.h"
+#include "engines/engine.h"
#include "scumm/imuse/imuse_internal.h"
#include "scumm/saveload.h"
diff --git a/engines/scumm/insane/insane.cpp b/engines/scumm/insane/insane.cpp
index 59fc99a857..86deddeda1 100644
--- a/engines/scumm/insane/insane.cpp
+++ b/engines/scumm/insane/insane.cpp
@@ -23,7 +23,7 @@
#include "common/stdafx.h"
-#include "base/engine.h"
+#include "engines/engine.h"
#include "common/system.h"
diff --git a/engines/scumm/insane/insane.h b/engines/scumm/insane/insane.h
index 1ba916cc5a..13baab49fe 100644
--- a/engines/scumm/insane/insane.h
+++ b/engines/scumm/insane/insane.h
@@ -23,7 +23,7 @@
#if !defined(INSANE_H) && !defined(DISABLE_SCUMM_7_8)
#define INSANE_H
-#include "base/engine.h"
+#include "engines/engine.h"
#include "scumm/intern.h"
#include "scumm/nut_renderer.h"
diff --git a/engines/scumm/insane/insane_ben.cpp b/engines/scumm/insane/insane_ben.cpp
index 35ad7004a3..573197e8c5 100644
--- a/engines/scumm/insane/insane_ben.cpp
+++ b/engines/scumm/insane/insane_ben.cpp
@@ -23,7 +23,7 @@
#include "common/stdafx.h"
-#include "base/engine.h"
+#include "engines/engine.h"
#include "scumm/insane/insane.h"
diff --git a/engines/scumm/insane/insane_enemy.cpp b/engines/scumm/insane/insane_enemy.cpp
index ec38aa9fe8..af5b0fe02b 100644
--- a/engines/scumm/insane/insane_enemy.cpp
+++ b/engines/scumm/insane/insane_enemy.cpp
@@ -23,7 +23,7 @@
#include "common/stdafx.h"
-#include "base/engine.h"
+#include "engines/engine.h"
#include "scumm/insane/insane.h"
diff --git a/engines/scumm/insane/insane_iact.cpp b/engines/scumm/insane/insane_iact.cpp
index 354128315b..dadb6d2572 100644
--- a/engines/scumm/insane/insane_iact.cpp
+++ b/engines/scumm/insane/insane_iact.cpp
@@ -23,7 +23,7 @@
#include "common/stdafx.h"
-#include "base/engine.h"
+#include "engines/engine.h"
#include "scumm/scumm.h"
diff --git a/engines/scumm/insane/insane_scenes.cpp b/engines/scumm/insane/insane_scenes.cpp
index 52a54edee8..5beca36999 100644
--- a/engines/scumm/insane/insane_scenes.cpp
+++ b/engines/scumm/insane/insane_scenes.cpp
@@ -23,7 +23,7 @@
#include "common/stdafx.h"
-#include "base/engine.h"
+#include "engines/engine.h"
#include "common/config-manager.h"
diff --git a/engines/scumm/player_nes.cpp b/engines/scumm/player_nes.cpp
index 8564ac1e41..0a63cf153c 100644
--- a/engines/scumm/player_nes.cpp
+++ b/engines/scumm/player_nes.cpp
@@ -23,7 +23,7 @@
*/
#include "common/stdafx.h"
-#include "base/engine.h"
+#include "engines/engine.h"
#include "scumm/player_nes.h"
#include "scumm/scumm.h"
#include "sound/mixer.h"
diff --git a/engines/scumm/player_v1.cpp b/engines/scumm/player_v1.cpp
index 0737bb5706..d752fbde2d 100644
--- a/engines/scumm/player_v1.cpp
+++ b/engines/scumm/player_v1.cpp
@@ -22,7 +22,7 @@
*/
#include "common/stdafx.h"
-#include "base/engine.h"
+#include "engines/engine.h"
#include "scumm/player_v1.h"
#include "scumm/scumm.h"
diff --git a/engines/scumm/player_v2.cpp b/engines/scumm/player_v2.cpp
index e8abbe1e03..9726149851 100644
--- a/engines/scumm/player_v2.cpp
+++ b/engines/scumm/player_v2.cpp
@@ -22,7 +22,7 @@
*/
#include "common/stdafx.h"
-#include "base/engine.h"
+#include "engines/engine.h"
#include "scumm/player_v2.h"
#include "scumm/scumm.h"
#include "sound/mididrv.h"
diff --git a/engines/scumm/player_v2a.cpp b/engines/scumm/player_v2a.cpp
index 36499ba527..23eeebf70b 100644
--- a/engines/scumm/player_v2a.cpp
+++ b/engines/scumm/player_v2a.cpp
@@ -22,7 +22,7 @@
*/
#include "common/stdafx.h"
-#include "base/engine.h"
+#include "engines/engine.h"
#include "scumm/player_v2a.h"
#include "scumm/scumm.h"
diff --git a/engines/scumm/player_v3a.cpp b/engines/scumm/player_v3a.cpp
index f4663b83f3..e229f4515e 100644
--- a/engines/scumm/player_v3a.cpp
+++ b/engines/scumm/player_v3a.cpp
@@ -22,7 +22,7 @@
*/
#include "common/stdafx.h"
-#include "base/engine.h"
+#include "engines/engine.h"
#include "scumm/player_v3a.h"
#include "scumm/scumm.h"
diff --git a/engines/scumm/script.h b/engines/scumm/script.h
index e832aee8d9..5655d164f5 100644
--- a/engines/scumm/script.h
+++ b/engines/scumm/script.h
@@ -24,7 +24,7 @@
#ifndef SCRIPT_H
#define SCRIPT_H
-#include "base/engine.h"
+#include "engines/engine.h"
namespace Scumm {
diff --git a/engines/scumm/scumm.h b/engines/scumm/scumm.h
index 5b6a91e046..20da240470 100644
--- a/engines/scumm/scumm.h
+++ b/engines/scumm/scumm.h
@@ -24,7 +24,7 @@
#ifndef SCUMM_H
#define SCUMM_H
-#include "base/engine.h"
+#include "engines/engine.h"
#include "common/endian.h"
#include "common/file.h"
#include "common/rect.h"
diff --git a/engines/scumm/smush/smush_player.cpp b/engines/scumm/smush/smush_player.cpp
index 122640e6a6..d2368de89f 100644
--- a/engines/scumm/smush/smush_player.cpp
+++ b/engines/scumm/smush/smush_player.cpp
@@ -22,7 +22,7 @@
#include "common/stdafx.h"
-#include "base/engine.h"
+#include "engines/engine.h"
#include "common/config-manager.h"
#include "common/file.h"