diff options
| author | Bastien Bouclet | 2018-05-06 15:51:03 +0200 |
|---|---|---|
| committer | Bastien Bouclet | 2018-05-10 09:04:23 +0200 |
| commit | 90b78c544657bf0fc41d6b86276a0873060345b5 (patch) | |
| tree | a9187f2a6d924360f6b0960fd08a7cf7cddbc8ba /engines/sword1 | |
| parent | faa2534f46611a47913004b55aa0e5ed5b7e4b7a (diff) | |
| download | scummvm-rg350-90b78c544657bf0fc41d6b86276a0873060345b5.tar.gz scummvm-rg350-90b78c544657bf0fc41d6b86276a0873060345b5.tar.bz2 scummvm-rg350-90b78c544657bf0fc41d6b86276a0873060345b5.zip | |
ENGINES: Merge GameDescriptor and DetectedGame
Diffstat (limited to 'engines/sword1')
| -rw-r--r-- | engines/sword1/detection.cpp | 28 |
1 files changed, 14 insertions, 14 deletions
diff --git a/engines/sword1/detection.cpp b/engines/sword1/detection.cpp index 205640a0a6..6504806423 100644 --- a/engines/sword1/detection.cpp +++ b/engines/sword1/detection.cpp @@ -214,29 +214,29 @@ DetectedGames SwordMetaEngine::detectGames(const Common::FSList &fslist) const { DetectedGame game; if (mainFilesFound && pcFilesFound && demoFilesFound) - game.matchedGame = GameDescriptor(sword1DemoSettings); + game = DetectedGame(sword1DemoSettings); else if (mainFilesFound && pcFilesFound && psxFilesFound) - game.matchedGame = GameDescriptor(sword1PSXSettings); + game = DetectedGame(sword1PSXSettings); else if (mainFilesFound && pcFilesFound && psxDemoFilesFound) - game.matchedGame = GameDescriptor(sword1PSXDemoSettings); + game = DetectedGame(sword1PSXDemoSettings); else if (mainFilesFound && pcFilesFound && !psxFilesFound) - game.matchedGame = GameDescriptor(sword1FullSettings); + game = DetectedGame(sword1FullSettings); else if (mainFilesFound && macFilesFound) - game.matchedGame = GameDescriptor(sword1MacFullSettings); + game = DetectedGame(sword1MacFullSettings); else if (mainFilesFound && macDemoFilesFound) - game.matchedGame = GameDescriptor(sword1MacDemoSettings); + game = DetectedGame(sword1MacDemoSettings); else return detectedGames; - game.matchedGame.setGUIOptions(GUIO2(GUIO_NOMIDI, GUIO_NOASPECT)); + game.setGUIOptions(GUIO2(GUIO_NOMIDI, GUIO_NOASPECT)); - game.matchedGame.appendGUIOptions(getGameGUIOptionsDescriptionLanguage(Common::EN_ANY)); - game.matchedGame.appendGUIOptions(getGameGUIOptionsDescriptionLanguage(Common::DE_DEU)); - game.matchedGame.appendGUIOptions(getGameGUIOptionsDescriptionLanguage(Common::FR_FRA)); - game.matchedGame.appendGUIOptions(getGameGUIOptionsDescriptionLanguage(Common::IT_ITA)); - game.matchedGame.appendGUIOptions(getGameGUIOptionsDescriptionLanguage(Common::ES_ESP)); - game.matchedGame.appendGUIOptions(getGameGUIOptionsDescriptionLanguage(Common::PT_BRA)); - game.matchedGame.appendGUIOptions(getGameGUIOptionsDescriptionLanguage(Common::CZ_CZE)); + game.appendGUIOptions(getGameGUIOptionsDescriptionLanguage(Common::EN_ANY)); + game.appendGUIOptions(getGameGUIOptionsDescriptionLanguage(Common::DE_DEU)); + game.appendGUIOptions(getGameGUIOptionsDescriptionLanguage(Common::FR_FRA)); + game.appendGUIOptions(getGameGUIOptionsDescriptionLanguage(Common::IT_ITA)); + game.appendGUIOptions(getGameGUIOptionsDescriptionLanguage(Common::ES_ESP)); + game.appendGUIOptions(getGameGUIOptionsDescriptionLanguage(Common::PT_BRA)); + game.appendGUIOptions(getGameGUIOptionsDescriptionLanguage(Common::CZ_CZE)); detectedGames.push_back(game); |