diff options
| author | Filippos Karapetis | 2010-07-02 23:12:17 +0000 |
|---|---|---|
| committer | Filippos Karapetis | 2010-07-02 23:12:17 +0000 |
| commit | 4304a414ab6ab3a46c10ddcd89ff9070caca96d9 (patch) | |
| tree | e875f56bddb3afeb749cc08369a14fd9960e7fd1 | |
| parent | 188f8d9a1199f60a1b0ca5a63b45e24813923d92 (diff) | |
| download | scummvm-rg350-4304a414ab6ab3a46c10ddcd89ff9070caca96d9.tar.gz scummvm-rg350-4304a414ab6ab3a46c10ddcd89ff9070caca96d9.tar.bz2 scummvm-rg350-4304a414ab6ab3a46c10ddcd89ff9070caca96d9.zip | |
AGI: Removed the deprecated (and confusing) getGameId() function inside the AgiEngine class, and fixed a related bug, too
svn-id: r50607
| -rw-r--r-- | engines/agi/agi.cpp | 7 | ||||
| -rw-r--r-- | engines/agi/agi.h | 5 | ||||
| -rw-r--r-- | engines/agi/view.cpp | 2 |
3 files changed, 1 insertions, 13 deletions
diff --git a/engines/agi/agi.cpp b/engines/agi/agi.cpp index a39725a973..4a994b731a 100644 --- a/engines/agi/agi.cpp +++ b/engines/agi/agi.cpp @@ -505,13 +505,6 @@ AgiEngine::AgiEngine(OSystem *syst, const AGIGameDescription *gameDesc) : AgiBas _mixer->setVolumeForSoundType(Audio::Mixer::kSFXSoundType, ConfMan.getInt("sfx_volume")); _mixer->setVolumeForSoundType(Audio::Mixer::kMusicSoundType, ConfMan.getInt("music_volume")); - const GameSettings *g; - - const char *gameid = ConfMan.get("gameid").c_str(); - for (g = agiSettings; g->gameid; ++g) - if (!scumm_stricmp(g->gameid, gameid)) - _gameId = g->id; - parseFeatures(); _rnd = new Common::RandomSource(); diff --git a/engines/agi/agi.h b/engines/agi/agi.h index 166470e6e4..507e7f7a11 100644 --- a/engines/agi/agi.h +++ b/engines/agi/agi.h @@ -792,8 +792,6 @@ public: }; class AgiEngine : public AgiBase { - int _gameId; - protected: // Engine APIs virtual Common::Error go(); @@ -806,9 +804,6 @@ protected: public: AgiEngine(OSystem *syst, const AGIGameDescription *gameDesc); virtual ~AgiEngine(); - int getGameId() { - return _gameId; - } Common::Error loadGameState(int slot); Common::Error saveGameState(int slot, const char *desc); diff --git a/engines/agi/view.cpp b/engines/agi/view.cpp index 03509e81f9..45244bb292 100644 --- a/engines/agi/view.cpp +++ b/engines/agi/view.cpp @@ -368,7 +368,7 @@ void AgiEngine::updateViewtable() { break; default: // for KQ4 - if (getVersion() == 0x3086 || getGameId() == GID_KQ4) + if (getVersion() == 0x3086 || getGameID() == GID_KQ4) loop = loopTable4[v->direction]; break; } |