diff options
author | Max Horn | 2006-03-09 02:52:51 +0000 |
---|---|---|
committer | Max Horn | 2006-03-09 02:52:51 +0000 |
commit | 86565fcca57454e91124410cfd6864ef1e202dc0 (patch) | |
tree | 83cc82217179d56f23836628520b7f63b4a0607d /engines/cine/cine.cpp | |
parent | d2f78184af00cd91f3f1f251199a436b53f4ae64 (diff) | |
download | scummvm-rg350-86565fcca57454e91124410cfd6864ef1e202dc0.tar.gz scummvm-rg350-86565fcca57454e91124410cfd6864ef1e202dc0.tar.bz2 scummvm-rg350-86565fcca57454e91124410cfd6864ef1e202dc0.zip |
- 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
Diffstat (limited to 'engines/cine/cine.cpp')
-rw-r--r-- | engines/cine/cine.cpp | 13 |
1 files changed, 6 insertions, 7 deletions
diff --git a/engines/cine/cine.cpp b/engines/cine/cine.cpp index d6256debf9..8ec2a86c96 100644 --- a/engines/cine/cine.cpp +++ b/engines/cine/cine.cpp @@ -63,9 +63,8 @@ struct CINEGameSettings { byte id; uint32 features; const char *detectname; - GameSettings toGameSettings() const { - GameSettings dummy = { name, description }; - return dummy; + GameDescriptor toGameDescriptor() const { + return GameDescriptor(name, description); } }; @@ -80,21 +79,21 @@ GameList Engine_CINE_gameIDList() { const CINEGameSettings *g = cine_settings; while (g->name) { - games.push_back(g->toGameSettings()); + games.push_back(g->toGameDescriptor()); g++; } return games; } -GameSettings Engine_CINE_findGameID(const char *gameid) { +GameDescriptor Engine_CINE_findGameID(const char *gameid) { const CINEGameSettings *g = cine_settings; while (g->name) { if (0 == scumm_stricmp(gameid, g->name)) break; g++; } - return g->toGameSettings(); + return g->toGameDescriptor(); } DetectedGameList Engine_CINE_detectGames(const FSList &fslist) { @@ -109,7 +108,7 @@ DetectedGameList Engine_CINE_detectGames(const FSList &fslist) { if (0 == scumm_stricmp(g->detectname, gameName)) { // Match found, add to list of candidates, then abort inner loop. - detectedGames.push_back(g->toGameSettings()); + detectedGames.push_back(g->toGameDescriptor()); break; } } |