- Merged GameDetector::detectGame() into GameDetector::detectMain()

- Replaced GameSettings GameDetector::_game by a simple gameid string

svn-id: r20753
This commit is contained in:
Max Horn 2006-02-18 12:50:48 +00:00
parent 8ac17430ac
commit 01fc7034b5
7 changed files with 26 additions and 36 deletions

View file

@ -291,8 +291,9 @@ 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));
if (caption.isEmpty() && detector._game.description)
caption = detector._game.description;
const char *desc = GameDetector::findGame(detector._gameid).description;
if (caption.isEmpty() && desc)
caption = desc;
if (caption.isEmpty())
caption = detector._targetName;
if (!caption.isEmpty()) {