From 86565fcca57454e91124410cfd6864ef1e202dc0 Mon Sep 17 00:00:00 2001 From: Max Horn Date: Thu, 9 Mar 2006 02:52:51 +0000 Subject: - Renamed GameSettings to PlainGameDescriptor - 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 --- engines/queen/queen.cpp | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) (limited to 'engines/queen') diff --git a/engines/queen/queen.cpp b/engines/queen/queen.cpp index ce90c09426..76aab5b3f4 100644 --- a/engines/queen/queen.cpp +++ b/engines/queen/queen.cpp @@ -55,7 +55,7 @@ bool isSmartphone(); #endif /* Flight of the Amazon Queen */ -static const GameSettings queen_setting[] = { +static const PlainGameDescriptor queen_setting[] = { { "queen", "Flight of the Amazon Queen" }, { "queen", "Flight of the Amazon Queen (Demo)" }, { "queen", "Flight of the Amazon Queen (Interview)" }, @@ -68,15 +68,14 @@ GameList Engine_QUEEN_gameIDList() { return games; } -GameSettings Engine_QUEEN_findGameID(const char *gameid) { +GameDescriptor Engine_QUEEN_findGameID(const char *gameid) { if (0 == scumm_stricmp(gameid, queen_setting[0].gameid)) return queen_setting[0]; - GameSettings dummy = { 0, 0 }; - return dummy; + return GameDescriptor(); } -GameSettings determineTarget(uint32 size) { +GameDescriptor determineTarget(uint32 size) { switch (size) { case 3724538: //regular demo case 3732177: -- cgit v1.2.3