diff options
author | Max Horn | 2006-04-09 19:44:40 +0000 |
---|---|---|
committer | Max Horn | 2006-04-09 19:44:40 +0000 |
commit | 66cdbaf1b5e01c062219f4850c91aaecba655ab1 (patch) | |
tree | 8b6772ce8cae19975c2a8953e75d52f26ad4f7f7 /engines/cine/cine.cpp | |
parent | 46ee06135ca1dba1644f28d5092a54324c0ac123 (diff) | |
download | scummvm-rg350-66cdbaf1b5e01c062219f4850c91aaecba655ab1.tar.gz scummvm-rg350-66cdbaf1b5e01c062219f4850c91aaecba655ab1.tar.bz2 scummvm-rg350-66cdbaf1b5e01c062219f4850c91aaecba655ab1.zip |
Moved GameSettings to namespace Cine; moved savePath to various.cpp
svn-id: r21733
Diffstat (limited to 'engines/cine/cine.cpp')
-rw-r--r-- | engines/cine/cine.cpp | 40 |
1 files changed, 17 insertions, 23 deletions
diff --git a/engines/cine/cine.cpp b/engines/cine/cine.cpp index e4be764e2c..192e5afcee 100644 --- a/engines/cine/cine.cpp +++ b/engines/cine/cine.cpp @@ -51,21 +51,12 @@ SfxPlayer *g_sfxPlayer; static void initialize(); -char *savePath; - -} // End of namespace Cine - - - struct GameSettings { - const char *name; + const char *gameid; const char *description; byte id; uint32 features; const char *detectname; - GameDescriptor toGameDescriptor() const { - return GameDescriptor(name, description); - } }; static const GameSettings cine_settings[] = { @@ -74,12 +65,15 @@ static const GameSettings cine_settings[] = { {NULL, NULL, 0, 0, NULL} }; +} // End of namespace Cine + + GameList Engine_CINE_gameIDList() { GameList games; - const GameSettings *g = cine_settings; + const Cine::GameSettings *g = Cine::cine_settings; - while (g->name) { - games.push_back(g->toGameDescriptor()); + while (g->gameid) { + games.push_back(*g); g++; } @@ -87,20 +81,20 @@ GameList Engine_CINE_gameIDList() { } GameDescriptor Engine_CINE_findGameID(const char *gameid) { - const GameSettings *g = cine_settings; - while (g->name) { - if (0 == scumm_stricmp(gameid, g->name)) + const Cine::GameSettings *g = Cine::cine_settings; + while (g->gameid) { + if (0 == scumm_stricmp(gameid, g->gameid)) break; g++; } - return g->toGameDescriptor(); + return *g; } DetectedGameList Engine_CINE_detectGames(const FSList &fslist) { DetectedGameList detectedGames; - const GameSettings *g; + const Cine::GameSettings *g; - for (g = cine_settings; g->name; ++g) { + for (g = Cine::cine_settings; g->gameid; ++g) { // Iterate over all files in the given directory for (FSList::const_iterator file = fslist.begin(); file != fslist.end(); ++file) { @@ -108,7 +102,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->toGameDescriptor()); + detectedGames.push_back(*g); break; } } @@ -134,10 +128,10 @@ CineEngine::CineEngine(GameDetector *detector, OSystem *syst) : Engine(syst) { _mixer->setVolumeForSoundType(Audio::Mixer::kSFXSoundType, ConfMan.getInt("sfx_volume")); _mixer->setVolumeForSoundType(Audio::Mixer::kMusicSoundType, ConfMan.getInt("music_volume")); - const GameSettings *g; + const Cine::GameSettings *g; - for (g = cine_settings; g->name; ++g) - if (!scumm_stricmp(g->name, detector->_targetName.c_str())) + for (g = Cine::cine_settings; g->gameid; ++g) + if (!scumm_stricmp(g->gameid, detector->_targetName.c_str())) _gameId = g->id; gameType = _gameId; |