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/sword2 | |
| 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/sword2')
| -rw-r--r-- | engines/sword2/sword2.cpp | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/engines/sword2/sword2.cpp b/engines/sword2/sword2.cpp index 231074641e..0ec0e3f726 100644 --- a/engines/sword2/sword2.cpp +++ b/engines/sword2/sword2.cpp @@ -192,9 +192,8 @@ DetectedGames detectGamesImpl(const Common::FSList &fslist, bool recursion = fal continue; // Match found, add to list of candidates, then abort inner loop. - DetectedGame game; - game.matchedGame = GameDescriptor(g->gameid, g->description); - game.matchedGame.setGUIOptions(GUIO2(GUIO_NOMIDI, GUIO_NOASPECT)); + DetectedGame game = DetectedGame(g->gameid, g->description); + game.setGUIOptions(GUIO2(GUIO_NOMIDI, GUIO_NOASPECT)); detectedGames.push_back(game); break; @@ -285,7 +284,7 @@ Common::Error Sword2MetaEngine::createInstance(OSystem *syst, Engine **engine) c DetectedGames detectedGames = detectGames(fslist); for (uint i = 0; i < detectedGames.size(); i++) { - if (detectedGames[i].matchedGame.gameId == gameid) { + if (detectedGames[i].gameId == gameid) { *engine = new Sword2::Sword2Engine(syst); return Common::kNoError; } |