From 4304a414ab6ab3a46c10ddcd89ff9070caca96d9 Mon Sep 17 00:00:00 2001
From: Filippos Karapetis
Date: Fri, 2 Jul 2010 23:12:17 +0000
Subject: AGI: Removed the deprecated (and confusing) getGameId() function
 inside the AgiEngine class, and fixed a related bug, too

svn-id: r50607
---
 engines/agi/agi.cpp  | 7 -------
 engines/agi/agi.h    | 5 -----
 engines/agi/view.cpp | 2 +-
 3 files changed, 1 insertion(+), 13 deletions(-)

(limited to 'engines')

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;
 			}
-- 
cgit v1.2.3