diff options
| -rw-r--r-- | engines/tucker/detection.cpp | 16 | ||||
| -rw-r--r-- | engines/tucker/tucker.cpp | 17 | ||||
| -rw-r--r-- | engines/tucker/tucker.h | 6 |
3 files changed, 13 insertions, 26 deletions
diff --git a/engines/tucker/detection.cpp b/engines/tucker/detection.cpp index 8f267420f4..f54342a516 100644 --- a/engines/tucker/detection.cpp +++ b/engines/tucker/detection.cpp @@ -45,7 +45,7 @@ static const Common::ADGameDescription tuckerGameDescriptions[] = { AD_ENTRY1s("infobar.txt", "f1e42a95972643462b9c3c2ea79d6683", 543), Common::FR_FRA, Common::kPlatformPC, - Common::ADGF_NO_FLAGS + Tucker::kGameFlagNoSubtitles }, { "tucker", @@ -53,7 +53,7 @@ static const Common::ADGameDescription tuckerGameDescriptions[] = { AD_ENTRY1s("infobar.txt", "9c1ddeafc5283b90d1a284bd0924831c", 462), Common::EN_ANY, Common::kPlatformPC, - Common::ADGF_NO_FLAGS + Tucker::kGameFlagEncodedData }, { "tucker", @@ -61,7 +61,7 @@ static const Common::ADGameDescription tuckerGameDescriptions[] = { AD_ENTRY1s("infobar.txt", "1b3ea79d8528ea3c7df83dd0ed345e37", 525), Common::ES_ESP, Common::kPlatformPC, - Common::ADGF_NO_FLAGS + Tucker::kGameFlagEncodedData, }, { "tucker", @@ -69,7 +69,7 @@ static const Common::ADGameDescription tuckerGameDescriptions[] = { AD_ENTRY1s("infobrgr.txt", "4df9eb65722418d1a1723508115b146c", 552), Common::DE_DEU, Common::kPlatformPC, - Common::ADGF_NO_FLAGS + Tucker::kGameFlagEncodedData }, { "tucker", @@ -77,7 +77,7 @@ static const Common::ADGameDescription tuckerGameDescriptions[] = { AD_ENTRY1s("infobar.txt", "5f85285bbc23ce57cbc164021ee1f23c", 525), Common::PL_POL, Common::kPlatformPC, - Common::ADGF_NO_FLAGS + 0, }, { "tucker", @@ -85,7 +85,7 @@ static const Common::ADGameDescription tuckerGameDescriptions[] = { AD_ENTRY1s("infobar.txt", "e548994877ff31ca304f6352ce022a8e", 497), Common::CZ_CZE, Common::kPlatformPC, - Common::ADGF_NO_FLAGS + Tucker::kGameFlagEncodedData }, AD_TABLE_END_MARKER }; @@ -107,7 +107,7 @@ static const Common::ADGameDescription tuckerDemoGameDescription = { AD_ENTRY1(0, 0), Common::EN_ANY, Common::kPlatformPC, - Common::ADGF_DEMO + Common::ADGF_DEMO | Tucker::kGameFlagDemo }; class TuckerMetaEngine : public Common::AdvancedMetaEngine { @@ -135,7 +135,7 @@ public: virtual bool createInstance(OSystem *syst, Engine **engine, const Common::ADGameDescription *desc) const { if (desc) { - *engine = new Tucker::TuckerEngine(syst, desc->language, (desc->flags & Common::ADGF_DEMO) != 0); + *engine = new Tucker::TuckerEngine(syst, desc->language, desc->flags); } return desc != 0; } diff --git a/engines/tucker/tucker.cpp b/engines/tucker/tucker.cpp index f68300249e..873f3e41b9 100644 --- a/engines/tucker/tucker.cpp +++ b/engines/tucker/tucker.cpp @@ -34,21 +34,8 @@ namespace Tucker { -TuckerEngine::TuckerEngine(OSystem *system, Common::Language language, bool isDemo) - : Engine(system) { - _gameLang = language; - _gameFlags = 0; - if (isDemo) { - _gameFlags |= kGameFlagDemo; - } - switch (language) { - case Common::FR_FRA: - _gameFlags |= kGameFlagNoSubtitles; - break; - default: - _gameFlags |= kGameFlagEncodedData; - break; - } +TuckerEngine::TuckerEngine(OSystem *system, Common::Language language, uint32 flags) + : Engine(system), _gameLang(language), _gameFlags(flags) { } TuckerEngine::~TuckerEngine() { diff --git a/engines/tucker/tucker.h b/engines/tucker/tucker.h index 26586a1bfb..b2ca3dd227 100644 --- a/engines/tucker/tucker.h +++ b/engines/tucker/tucker.h @@ -235,8 +235,8 @@ public: kMaxDirtyRects = 16 }; - TuckerEngine(OSystem *system, Common::Language language, bool isDemo); - ~TuckerEngine(); + TuckerEngine(OSystem *system, Common::Language language, uint32 flags); + virtual ~TuckerEngine(); virtual Common::Error init(); virtual Common::Error go(); @@ -572,7 +572,7 @@ protected: Common::RandomSource _rnd; AnimationSequencePlayer *_player; Common::Language _gameLang; - int _gameFlags; + uint32 _gameFlags; bool _quitGame; bool _fastMode; |