AGI: Removed the deprecated (and confusing) getGameId() function inside the AgiEngine class, and fixed a related bug, too

svn-id: r50607
This commit is contained in:
Filippos Karapetis 2010-07-02 23:12:17 +00:00
parent 188f8d9a11
commit 4304a414ab
3 changed files with 1 additions and 13 deletions

View File

@ -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();

View File

@ -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);

View File

@ -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;
}