diff options
-rw-r--r-- | engines/wintermute/base/base_engine.h | 18 | ||||
-rw-r--r-- | engines/wintermute/detection.cpp | 1 | ||||
-rw-r--r-- | engines/wintermute/game_description.h | 17 | ||||
-rw-r--r-- | engines/wintermute/wintermute.cpp | 1 | ||||
-rw-r--r-- | engines/wintermute/wintermute.h | 4 |
5 files changed, 21 insertions, 20 deletions
diff --git a/engines/wintermute/base/base_engine.h b/engines/wintermute/base/base_engine.h index cbf5d92d00..905d227d3c 100644 --- a/engines/wintermute/base/base_engine.h +++ b/engines/wintermute/base/base_engine.h @@ -34,10 +34,24 @@ #include "common/random.h" #include "common/language.h" -#include "engines/wintermute/game_description.h" - namespace Wintermute { +enum WMETargetExecutable { + OLDEST_VERSION, + WME_1_0_0, + WME_1_1_0, + WME_1_2_0, + WME_1_3_0, + WME_1_4_0, + WME_1_5_0, + WME_1_6_0, + WME_1_7_0, + WME_1_8_0, + WME_1_8_6, + WME_1_9_0, + LATEST_VERSION +}; + class BaseFileManager; class BaseRegistry; class BaseGame; diff --git a/engines/wintermute/detection.cpp b/engines/wintermute/detection.cpp index 9ccb75d62f..df5cc41b10 100644 --- a/engines/wintermute/detection.cpp +++ b/engines/wintermute/detection.cpp @@ -22,6 +22,7 @@ #include "engines/advancedDetector.h" #include "engines/wintermute/wintermute.h" +#include "engines/wintermute/game_description.h" #include "engines/wintermute/base/base_persistence_manager.h" #include "common/config-manager.h" diff --git a/engines/wintermute/game_description.h b/engines/wintermute/game_description.h index 313fff8bbf..92f62dd7f6 100644 --- a/engines/wintermute/game_description.h +++ b/engines/wintermute/game_description.h @@ -24,25 +24,10 @@ #define WINTERMUTE_GAME_DESCRIPTION_H #include "engines/advancedDetector.h" +#include "engines/wintermute/base/base_engine.h" namespace Wintermute { -enum WMETargetExecutable { - OLDEST_VERSION, - WME_1_0_0, - WME_1_1_0, - WME_1_2_0, - WME_1_3_0, - WME_1_4_0, - WME_1_5_0, - WME_1_6_0, - WME_1_7_0, - WME_1_8_0, - WME_1_8_6, - WME_1_9_0, - LATEST_VERSION -}; - struct WMEGameDescription { ADGameDescription adDesc; WMETargetExecutable targetExecutable; diff --git a/engines/wintermute/wintermute.cpp b/engines/wintermute/wintermute.cpp index e68004d1e5..811ecce9ed 100644 --- a/engines/wintermute/wintermute.cpp +++ b/engines/wintermute/wintermute.cpp @@ -33,6 +33,7 @@ #include "engines/util.h" #include "engines/wintermute/ad/ad_game.h" #include "engines/wintermute/wintermute.h" +#include "engines/wintermute/game_description.h" #include "engines/wintermute/debugger.h" #include "engines/wintermute/platform_osystem.h" #include "engines/wintermute/base/base_engine.h" diff --git a/engines/wintermute/wintermute.h b/engines/wintermute/wintermute.h index a8f9a18530..346354ef97 100644 --- a/engines/wintermute/wintermute.h +++ b/engines/wintermute/wintermute.h @@ -24,9 +24,8 @@ #define WINTERMUTE_WINTERMUTE_H #include "engines/engine.h" -#include "engines/advancedDetector.h" #include "gui/debugger.h" -#include "engines/wintermute/game_description.h" +#include "common/fs.h" namespace Wintermute { @@ -34,6 +33,7 @@ class Console; class BaseGame; class SystemClassRegistry; class DebuggerController; +struct WMEGameDescription; // our engine debug channels enum { |