diff options
author | Max Horn | 2012-02-22 18:21:57 +0100 |
---|---|---|
committer | Max Horn | 2012-02-22 18:25:37 +0100 |
commit | 37216ab3814f68d45df1f02fd8765e58b4a1b9df (patch) | |
tree | e7396e14cd6524679f338e5acf54e017149d1149 /engines/dreamweb | |
parent | 4202d45fce31db586991e9afb3aaca82baa4404b (diff) | |
download | scummvm-rg350-37216ab3814f68d45df1f02fd8765e58b4a1b9df.tar.gz scummvm-rg350-37216ab3814f68d45df1f02fd8765e58b4a1b9df.tar.bz2 scummvm-rg350-37216ab3814f68d45df1f02fd8765e58b4a1b9df.zip |
DREAMWEB: Avoid including advancedDetector.h from dreamweb.h
Diffstat (limited to 'engines/dreamweb')
-rw-r--r-- | engines/dreamweb/detection.cpp | 10 | ||||
-rw-r--r-- | engines/dreamweb/detection_tables.h | 4 | ||||
-rw-r--r-- | engines/dreamweb/dreamweb.cpp | 14 | ||||
-rw-r--r-- | engines/dreamweb/dreamweb.h | 8 |
4 files changed, 21 insertions, 15 deletions
diff --git a/engines/dreamweb/detection.cpp b/engines/dreamweb/detection.cpp index b891c2a3ea..9d3797db03 100644 --- a/engines/dreamweb/detection.cpp +++ b/engines/dreamweb/detection.cpp @@ -25,6 +25,8 @@ #include "common/algorithm.h" #include "common/system.h" +#include "engines/advancedDetector.h" + #include "graphics/thumbnail.h" #include "dreamweb/dreamweb.h" @@ -215,4 +217,12 @@ bool DreamWebEngine::canSaveGameStateCurrently() { return false; } +Common::Language DreamWebEngine::getLanguage() const { + return _gameDescription->desc.language; +} + +bool DreamWebEngine::isCD() { + return _gameDescription->desc.flags & ADGF_CD; +} + } // End of namespace DreamWeb diff --git a/engines/dreamweb/detection_tables.h b/engines/dreamweb/detection_tables.h index 75f5786268..216e6715dc 100644 --- a/engines/dreamweb/detection_tables.h +++ b/engines/dreamweb/detection_tables.h @@ -25,6 +25,10 @@ namespace DreamWeb { +struct DreamWebGameDescription { + ADGameDescription desc; +}; + static const DreamWebGameDescription gameDescriptions[] = { // International floppy release { diff --git a/engines/dreamweb/dreamweb.cpp b/engines/dreamweb/dreamweb.cpp index 0a5deb4657..2ee20210ba 100644 --- a/engines/dreamweb/dreamweb.cpp +++ b/engines/dreamweb/dreamweb.cpp @@ -30,6 +30,8 @@ #include "common/timer.h" #include "common/util.h" +#include "engines/advancedDetector.h" + #include "graphics/palette.h" #include "graphics/surface.h" @@ -60,8 +62,6 @@ DreamWebEngine::DreamWebEngine(OSystem *syst, const DreamWebGameDescription *gam _channel0 = 0; _channel1 = 0; - _language = gameDesc->desc.language; - _openChangeSize = kInventx+(4*kItempicsize); _quitRequested = false; @@ -477,10 +477,9 @@ uint8 DreamWebEngine::modifyChar(uint8 c) const { if (c < 128) return c; - switch(_language) { + switch(getLanguage()) { case Common::DE_DEU: - switch(c) - { + switch(c) { case 129: return 'Z' + 3; case 132: @@ -528,11 +527,8 @@ uint8 DreamWebEngine::modifyChar(uint8 c) const { } } -bool DreamWebEngine::isCD() { - return _gameDescription->desc.flags & ADGF_CD; -} - bool DreamWebEngine::hasSpeech() { return isCD() && _hasSpeech; } + } // End of namespace DreamWeb diff --git a/engines/dreamweb/dreamweb.h b/engines/dreamweb/dreamweb.h index 38016e5897..981ee86d4e 100644 --- a/engines/dreamweb/dreamweb.h +++ b/engines/dreamweb/dreamweb.h @@ -34,7 +34,6 @@ #include "audio/audiostream.h" #include "audio/mixer.h" -#include "engines/advancedDetector.h" #include "engines/engine.h" #include "dreamweb/console.h" @@ -98,9 +97,7 @@ enum { kDebugSaveLoad = (1 << 1) }; -struct DreamWebGameDescription { - ADGameDescription desc; -}; +struct DreamWebGameDescription; class DreamWebEngine : public Engine { private: @@ -149,7 +146,7 @@ public: void enableSavingOrLoading(bool enable = true) { _enableSavingOrLoading = enable; } - Common::Language getLanguage() const { return _language; } + Common::Language getLanguage() const; uint8 modifyChar(uint8 c) const; void stopSound(uint8 channel); @@ -167,7 +164,6 @@ private: bool _turbo; uint _oldMouseState; bool _enableSavingOrLoading; - Common::Language _language; struct Sample { uint offset; |