aboutsummaryrefslogtreecommitdiff
path: root/engines/obsolete.cpp
diff options
context:
space:
mode:
authorBastien Bouclet2018-05-06 12:57:08 +0200
committerBastien Bouclet2018-05-10 09:04:23 +0200
commit8fb149e3c7603f023dfccf2b2056a9a2fda431c2 (patch)
treea758cefc70a784a65045d09d96f44ed1c16abbb8 /engines/obsolete.cpp
parentcf1ebf29516bd74927fd7b632b72fd8973f72e98 (diff)
downloadscummvm-rg350-8fb149e3c7603f023dfccf2b2056a9a2fda431c2.tar.gz
scummvm-rg350-8fb149e3c7603f023dfccf2b2056a9a2fda431c2.tar.bz2
scummvm-rg350-8fb149e3c7603f023dfccf2b2056a9a2fda431c2.zip
ENGINES: Change MetaEngine::findGame to return a plain game descriptor
Diffstat (limited to 'engines/obsolete.cpp')
-rw-r--r--engines/obsolete.cpp10
1 files changed, 5 insertions, 5 deletions
diff --git a/engines/obsolete.cpp b/engines/obsolete.cpp
index d65fb13ec1..48809df712 100644
--- a/engines/obsolete.cpp
+++ b/engines/obsolete.cpp
@@ -55,7 +55,7 @@ void upgradeTargetIfNecessary(const ObsoleteGameID *obsoleteList) {
}
}
-GameDescriptor findGameID(
+PlainGameDescriptor findGameID(
const char *gameid,
const PlainGameDescriptor *gameids,
const ObsoleteGameID *obsoleteList
@@ -63,7 +63,7 @@ GameDescriptor findGameID(
// First search the list of supported gameids for a match.
const PlainGameDescriptor *g = findPlainGameDescriptor(gameid, gameids);
if (g)
- return GameDescriptor(*g);
+ return *g;
// If we didn't find the gameid in the main list, check if it
// is an obsolete game id.
@@ -73,16 +73,16 @@ GameDescriptor findGameID(
if (0 == scumm_stricmp(gameid, o->from)) {
g = findPlainGameDescriptor(o->to, gameids);
if (g && g->description)
- return GameDescriptor(gameid, "Obsolete game ID (" + Common::String(g->description) + ")");
+ return PlainGameDescriptor(gameid, g->description);
else
- return GameDescriptor(gameid, "Obsolete game ID");
+ return PlainGameDescriptor(gameid, "Obsolete game ID");
}
o++;
}
}
// No match found
- return GameDescriptor();
+ return PlainGameDescriptor();
}
} // End of namespace Engines