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/scumm | |
| 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/scumm')
| -rw-r--r-- | engines/scumm/detection.cpp | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/engines/scumm/detection.cpp b/engines/scumm/detection.cpp index 1395fc4fd7..fccb30b0fa 100644 --- a/engines/scumm/detection.cpp +++ b/engines/scumm/detection.cpp @@ -1036,15 +1036,14 @@ DetectedGames ScummMetaEngine::detectGames(const Common::FSList &fslist) const { const PlainGameDescriptor *g = findPlainGameDescriptor(x->game.gameid, gameDescriptions); assert(g); - DetectedGame game; - game.matchedGame = GameDescriptor(x->game.gameid, g->description, x->language, x->game.platform, x->extra); + DetectedGame game = DetectedGame(x->game.gameid, g->description, x->language, x->game.platform, x->extra); // Compute and set the preferred target name for this game. // Based on generateComplexID() in advancedDetector.cpp. - game.matchedGame.preferredTarget = generatePreferredTarget(*x); + game.preferredTarget = generatePreferredTarget(*x); - game.matchedGame.setGUIOptions(x->game.guioptions + MidiDriver::musicType2GUIO(x->game.midi)); - game.matchedGame.appendGUIOptions(getGameGUIOptionsDescriptionLanguage(x->language)); + game.setGUIOptions(x->game.guioptions + MidiDriver::musicType2GUIO(x->game.midi)); + game.appendGUIOptions(getGameGUIOptionsDescriptionLanguage(x->language)); detectedGames.push_back(game); } |
