diff options
| -rw-r--r-- | engines/bladerunner/bladerunner.cpp | 3 | ||||
| -rw-r--r-- | engines/bladerunner/detection.cpp | 10 | ||||
| -rw-r--r-- | engines/bladerunner/detection_tables.h | 87 |
3 files changed, 79 insertions, 21 deletions
diff --git a/engines/bladerunner/bladerunner.cpp b/engines/bladerunner/bladerunner.cpp index c1d1a27b35..5c8ecbd7cc 100644 --- a/engines/bladerunner/bladerunner.cpp +++ b/engines/bladerunner/bladerunner.cpp @@ -112,7 +112,7 @@ BladeRunnerEngine::BladeRunnerEngine(OSystem *syst, const ADGameDescription *des _sitcomMode = false; _shortyMode = false; - _cutContent = true; + _cutContent = Common::String(desc->gameId).contains("bladerunner-final"); _playerLosesControlCounter = 0; @@ -447,7 +447,6 @@ bool BladeRunnerEngine::startup(bool hasSavegames) { _sitcomMode = ConfMan.getBool("sitcom"); _shortyMode = ConfMan.getBool("shorty"); - _cutContent = ConfMan.getBool("cutcontent"); _items = new Items(this); diff --git a/engines/bladerunner/detection.cpp b/engines/bladerunner/detection.cpp index c56ff1cd0d..a353e9646a 100644 --- a/engines/bladerunner/detection.cpp +++ b/engines/bladerunner/detection.cpp @@ -37,6 +37,7 @@ namespace BladeRunner { static const PlainGameDescriptor bladeRunnerGames[] = { {"bladerunner", "Blade Runner"}, + {"bladerunner-final", "Blade Runner with restored content"}, {0, 0} }; @@ -59,15 +60,6 @@ static const ADExtraGuiOptionsMap optionsList[] = { false } }, - { - GAMEOPTION_CUT_CONTENT, - { - _s("Restore cut content"), - _s("Restore content which was cut from the original game"), - "cutcontent", - true - } - }, AD_EXTRA_GUI_OPTIONS_TERMINATOR }; diff --git a/engines/bladerunner/detection_tables.h b/engines/bladerunner/detection_tables.h index 8e8136e371..66dad18e1c 100644 --- a/engines/bladerunner/detection_tables.h +++ b/engines/bladerunner/detection_tables.h @@ -32,7 +32,7 @@ namespace BladeRunner { static const ADGameDescription gameDescriptions[] = { - // BladeRunner + // BladeRunner (English) { "bladerunner", 0, @@ -40,7 +40,7 @@ static const ADGameDescription gameDescriptions[] = { Common::EN_ANY, Common::kPlatformWindows, ADGF_NO_FLAGS, - GUIO3(GAMEOPTION_SITCOM, GAMEOPTION_SHORTY, GAMEOPTION_CUT_CONTENT) + GUIO2(GAMEOPTION_SITCOM, GAMEOPTION_SHORTY) }, // BladeRunner (German) @@ -51,7 +51,7 @@ static const ADGameDescription gameDescriptions[] = { Common::DE_DEU, Common::kPlatformWindows, ADGF_NO_FLAGS, - GUIO3(GAMEOPTION_SITCOM, GAMEOPTION_SHORTY, GAMEOPTION_CUT_CONTENT) + GUIO2(GAMEOPTION_SITCOM, GAMEOPTION_SHORTY) }, // BladeRunner (French) - Bug #9722 @@ -62,7 +62,7 @@ static const ADGameDescription gameDescriptions[] = { Common::FR_FRA, Common::kPlatformWindows, ADGF_NO_FLAGS, - GUIO3(GAMEOPTION_SITCOM, GAMEOPTION_SHORTY, GAMEOPTION_CUT_CONTENT) + GUIO2(GAMEOPTION_SITCOM, GAMEOPTION_SHORTY) }, // BladeRunner (Italian) @@ -73,7 +73,7 @@ static const ADGameDescription gameDescriptions[] = { Common::IT_ITA, Common::kPlatformWindows, ADGF_NO_FLAGS, - GUIO3(GAMEOPTION_SITCOM, GAMEOPTION_SHORTY, GAMEOPTION_CUT_CONTENT) + GUIO2(GAMEOPTION_SITCOM, GAMEOPTION_SHORTY) }, // BladeRunner (Russian) @@ -84,10 +84,10 @@ static const ADGameDescription gameDescriptions[] = { Common::RU_RUS, Common::kPlatformWindows, ADGF_NO_FLAGS, - GUIO3(GAMEOPTION_SITCOM, GAMEOPTION_SHORTY, GAMEOPTION_CUT_CONTENT) + GUIO2(GAMEOPTION_SITCOM, GAMEOPTION_SHORTY) }, - // BladeRunner (Russian - alternate version) + // BladeRunner (Russian - Fargus version) { "bladerunner", 0, @@ -95,10 +95,9 @@ static const ADGameDescription gameDescriptions[] = { Common::RU_RUS, Common::kPlatformWindows, ADGF_NO_FLAGS, - GUIO3(GAMEOPTION_SITCOM, GAMEOPTION_SHORTY, GAMEOPTION_CUT_CONTENT) + GUIO2(GAMEOPTION_SITCOM, GAMEOPTION_SHORTY) }, - // BladeRunner (Spanish) { "bladerunner", @@ -107,7 +106,75 @@ static const ADGameDescription gameDescriptions[] = { Common::ES_ESP, Common::kPlatformWindows, ADGF_NO_FLAGS, - GUIO3(GAMEOPTION_SITCOM, GAMEOPTION_SHORTY, GAMEOPTION_CUT_CONTENT) + GUIO2(GAMEOPTION_SITCOM, GAMEOPTION_SHORTY) + }, + + // Versions with restored content + + // BladeRunner (English) + { + "bladerunner-final", + 0, + AD_ENTRY1s("STARTUP.MIX", "5643b53306ca7764cf1ec7b79c9630a3", 2312374), + Common::EN_ANY, + Common::kPlatformWindows, + ADGF_NO_FLAGS, + GUIO2(GAMEOPTION_SITCOM, GAMEOPTION_SHORTY) + }, + + // BladeRunner (German) + { + "bladerunner-final", + 0, + AD_ENTRY1s("STARTUP.MIX", "57d674ed860148a530b7f4957cbe65ec", 2314301), + Common::DE_DEU, + Common::kPlatformWindows, + ADGF_NO_FLAGS, + GUIO2(GAMEOPTION_SITCOM, GAMEOPTION_SHORTY) + }, + + // BladeRunner (French) + { + "bladerunner-final", + 0, + AD_ENTRY1s("STARTUP.MIX", "39d1901df50935d58aee252707134952", 2314526), + Common::FR_FRA, + Common::kPlatformWindows, + ADGF_NO_FLAGS, + GUIO2(GAMEOPTION_SITCOM, GAMEOPTION_SHORTY) + }, + + // BladeRunner (Italian) + { + "bladerunner-final", + 0, + AD_ENTRY1s("STARTUP.MIX", "c7ceb9c691223d25e78516aa519ff504", 2314461), + Common::IT_ITA, + Common::kPlatformWindows, + ADGF_NO_FLAGS, + GUIO2(GAMEOPTION_SITCOM, GAMEOPTION_SHORTY) + }, + + // BladeRunner (Russian) + { + "bladerunner-final", + 0, + AD_ENTRY1s("STARTUP.MIX", "c198b54a5366b88b1734bbca21d3b192", 2678672), + Common::RU_RUS, + Common::kPlatformWindows, + ADGF_NO_FLAGS, + GUIO2(GAMEOPTION_SITCOM, GAMEOPTION_SHORTY) + }, + + // BladeRunner (Russian - Fargus version) + { + "bladerunner-final", + 0, + AD_ENTRY1s("STARTUP.MIX", "bf42af841d9f4b643665013a348c81e0", 2483111), + Common::RU_RUS, + Common::kPlatformWindows, + ADGF_NO_FLAGS, + GUIO2(GAMEOPTION_SITCOM, GAMEOPTION_SHORTY) }, AD_TABLE_END_MARKER |