thirdparty/scummvm
2
0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

- Renamed GameSettings to PlainGameDescriptor

Browse source 
- Added new GameDescriptor struct (similar to PlainGameDescriptor but with
  Common::String members instead of const char * ones)
- Changed DetectedGame to subclass GameDescriptor
- Removed toGameSettings() in favor of new (template) constructors in
  DetectedGame and GameDescriptor
- Fixed a bug in the obsolete gameid handling in the SCUMM & SIMON engines

svn-id: r21150
This commit is contained in:
Max Horn 2006-03-09 02:52:51 +00:00
parent d2f78184af
commit 86565fcca5
17 changed files with 126 additions and 131 deletions
Download patch file Download diff file Expand all files Collapse all files

4
base/main.cpp
View file

@ -291,8 +291,8 @@ static int runGame(GameDetector &detector, OSystem &system, const Common::String
// Set the window caption to the game name
Common::String caption(ConfMan.get("description", detector._targetName));
const char *desc = GameDetector::findGame(detector._gameid).description;
if (caption.isEmpty() && desc)
Common::String desc = GameDetector::findGame(detector._gameid).description;
if (caption.isEmpty() && !desc.isEmpty())
caption = desc;
if (caption.isEmpty())
caption = detector._targetName;