[Scummvm-cvs-logs] SF.net SVN: scummvm:[50607] scummvm/trunk/engines/agi

[thebluegr at users.sourceforge.net]

Revision: 50607
          http://scummvm.svn.sourceforge.net/scummvm/?rev=50607&view=rev
Author:   thebluegr
Date:     2010-07-02 23:12:17 +0000 (Fri, 02 Jul 2010)

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

Modified Paths:
--------------
    scummvm/trunk/engines/agi/agi.cpp
    scummvm/trunk/engines/agi/agi.h
    scummvm/trunk/engines/agi/view.cpp

Modified: scummvm/trunk/engines/agi/agi.cpp
===================================================================
--- scummvm/trunk/engines/agi/agi.cpp	2010-07-02 22:55:56 UTC (rev 50606)
+++ scummvm/trunk/engines/agi/agi.cpp	2010-07-02 23:12:17 UTC (rev 50607)
@@ -505,13 +505,6 @@
 	_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();

Modified: scummvm/trunk/engines/agi/agi.h
===================================================================
--- scummvm/trunk/engines/agi/agi.h	2010-07-02 22:55:56 UTC (rev 50606)
+++ scummvm/trunk/engines/agi/agi.h	2010-07-02 23:12:17 UTC (rev 50607)
@@ -792,8 +792,6 @@
 };
 
 class AgiEngine : public AgiBase {
-	int _gameId;
-
 protected:
 	// Engine APIs
 	virtual Common::Error go();
@@ -806,9 +804,6 @@
 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);

Modified: scummvm/trunk/engines/agi/view.cpp
===================================================================
--- scummvm/trunk/engines/agi/view.cpp	2010-07-02 22:55:56 UTC (rev 50606)
+++ scummvm/trunk/engines/agi/view.cpp	2010-07-02 23:12:17 UTC (rev 50607)
@@ -368,7 +368,7 @@
 				break;
 			default:
 				// for KQ4
-				if (getVersion() == 0x3086 || getGameId() == GID_KQ4)
+				if (getVersion() == 0x3086 || getGameID() == GID_KQ4)
 					loop = loopTable4[v->direction];
 				break;
 			}


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.