thirdparty/scummvm
2
0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

DREAMWEB: Avoid including advancedDetector.h from dreamweb.h

Browse source
This commit is contained in:
Max Horn 2012-02-22 18:21:57 +01:00
parent 4202d45fce
commit 37216ab381
4 changed files with 21 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

10
engines/dreamweb/detection.cpp
View file

@ -25,6 +25,8 @@
#include "common/algorithm.h" #include "common/algorithm.h"
#include "common/system.h" #include "common/system.h"
#include "engines/advancedDetector.h"
#include "graphics/thumbnail.h" #include "graphics/thumbnail.h"
#include "dreamweb/dreamweb.h" #include "dreamweb/dreamweb.h"
@ -215,4 +217,12 @@ bool DreamWebEngine::canSaveGameStateCurrently() {
return false; return false;
} }
Common::Language DreamWebEngine::getLanguage() const {
return _gameDescription->desc.language;
}
bool DreamWebEngine::isCD() {
return _gameDescription->desc.flags & ADGF_CD;
}
} // End of namespace DreamWeb } // End of namespace DreamWeb

4
engines/dreamweb/detection_tables.h
View file

@ -25,6 +25,10 @@
namespace DreamWeb { namespace DreamWeb {
struct DreamWebGameDescription {
ADGameDescription desc;
};
static const DreamWebGameDescription gameDescriptions[] = { static const DreamWebGameDescription gameDescriptions[] = {
// International floppy release // International floppy release
{ {

14
engines/dreamweb/dreamweb.cpp
View file

@ -30,6 +30,8 @@
#include "common/timer.h" #include "common/timer.h"
#include "common/util.h" #include "common/util.h"
#include "engines/advancedDetector.h"
#include "graphics/palette.h" #include "graphics/palette.h"
#include "graphics/surface.h" #include "graphics/surface.h"
@ -60,8 +62,6 @@ DreamWebEngine::DreamWebEngine(OSystem *syst, const DreamWebGameDescription *gam
_channel0 = 0; _channel0 = 0;
_channel1 = 0; _channel1 = 0;
_language = gameDesc->desc.language;
_openChangeSize = kInventx+(4*kItempicsize); _openChangeSize = kInventx+(4*kItempicsize);
_quitRequested = false; _quitRequested = false;
@ -477,10 +477,9 @@ uint8 DreamWebEngine::modifyChar(uint8 c) const {
if (c < 128) if (c < 128)
return c; return c;
switch(_language) { switch(getLanguage()) {
case Common::DE_DEU: case Common::DE_DEU:
switch(c) switch(c) {
{
case 129: case 129:
return 'Z' + 3; return 'Z' + 3;
case 132: case 132:
@ -528,11 +527,8 @@ uint8 DreamWebEngine::modifyChar(uint8 c) const {
} }
} }
bool DreamWebEngine::isCD() {
return _gameDescription->desc.flags & ADGF_CD;
}
bool DreamWebEngine::hasSpeech() { bool DreamWebEngine::hasSpeech() {
return isCD() && _hasSpeech; return isCD() && _hasSpeech;
} }
} // End of namespace DreamWeb } // End of namespace DreamWeb

8
engines/dreamweb/dreamweb.h
View file

@ -34,7 +34,6 @@
#include "audio/audiostream.h" #include "audio/audiostream.h"
#include "audio/mixer.h" #include "audio/mixer.h"
#include "engines/advancedDetector.h"
#include "engines/engine.h" #include "engines/engine.h"
#include "dreamweb/console.h" #include "dreamweb/console.h"
@ -98,9 +97,7 @@ enum {
kDebugSaveLoad = (1 << 1) kDebugSaveLoad = (1 << 1)
}; };
struct DreamWebGameDescription { struct DreamWebGameDescription;
ADGameDescription desc;
};
class DreamWebEngine : public Engine { class DreamWebEngine : public Engine {
private: private:
@ -149,7 +146,7 @@ public:
void enableSavingOrLoading(bool enable = true) { _enableSavingOrLoading = enable; } void enableSavingOrLoading(bool enable = true) { _enableSavingOrLoading = enable; }
Common::Language getLanguage() const { return _language; } Common::Language getLanguage() const;
uint8 modifyChar(uint8 c) const; uint8 modifyChar(uint8 c) const;
void stopSound(uint8 channel); void stopSound(uint8 channel);
@ -167,7 +164,6 @@ private:
bool _turbo; bool _turbo;
uint _oldMouseState; uint _oldMouseState;
bool _enableSavingOrLoading; bool _enableSavingOrLoading;
Common::Language _language;
struct Sample { struct Sample {
uint offset; uint offset;