libretro/scummvm
1
0
Fork 0
mirror of https://github.com/libretro/scummvm.git synced 2025-01-27 05:32:45 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Add the known 'extra' info to the description string; and removed the old hack which added this information during launch (which really was a bad hack)

Browse Source 
svn-id: r21155
This commit is contained in:
Max Horn 2006-03-09 03:21:23 +00:00
parent e53e0e5885
commit ea26ccea4a
1 changed files with 15 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
engines/scumm/plugin.cpp
View File

@ -1192,7 +1192,7 @@ DetectedGameList Engine_SCUMM_detectGames(const FSList &fslist) {
// Find the GameDescriptor for that gameid
for (g = scumm_settings; g->gameid; ++g) {
if (0 == scumm_stricmp(g->gameid, gameid))
break;
break;
}
assert(g->gameid);
DetectedGame dg(g->gameid, findDescriptionFromGameID(g->gameid), elem->language);
@ -1201,19 +1201,25 @@ DetectedGameList Engine_SCUMM_detectGames(const FSList &fslist) {
else
dg.platform = elem->platform;
const bool customLanguage = (dg.language != Common::UNK_LANG);
const bool customPlatform = (dg.platform != Common::kPlatformUnknown);
const bool hasCustomLanguage = (dg.language != Common::UNK_LANG);
const bool hasCustomPlatform = (dg.platform != Common::kPlatformUnknown);
const bool hasExtraDesc = (elem->extra && elem->extra[0]);
// Adapt the description string if custom platform/language is set.
// TODO: Also use the 'extra' information, like "Demo" etc.
if (customLanguage || customPlatform) {
if (hasCustomLanguage || hasCustomPlatform || hasExtraDesc) {
dg.description += " (";
if (customLanguage)
if (hasCustomLanguage)
dg.description += Common::getLanguageDescription(dg.language);
if (customLanguage && customPlatform)
dg.description += "/";
if (customPlatform)
if (hasCustomPlatform) {
if (hasCustomLanguage)
dg.description += "/";
dg.description += Common::getPlatformDescription(dg.platform);
}
if (hasExtraDesc) {
if (hasCustomPlatform || hasCustomLanguage)
dg.description += "/";
dg.description += elem->extra;
}
dg.description += ")";
}
@ -1345,17 +1351,6 @@ Engine *Engine_SCUMM_create(GameDetector *detector, OSystem *syst) {
// gameid (since we abused that field to store the MD5).
game = *g;
game.gameid = gameid;
if (game.extra) {
Common::String desc(findDescriptionFromGameID(gameid));
desc += " (";
desc += game.extra;
desc += ")";
// FIXME: Unconditionally setting the window caption here seems
// quite wrong. In particular, we override whatever custom
// description the user has set.
g_system->setWindowCaption(desc.c_str());
}
break;
}
g++;