[Scummvm-cvs-logs] SF.net SVN: scummvm:[47951] scummvm/trunk/engines/sci

[thebluegr at users.sourceforge.net]

Revision: 47951
          http://scummvm.svn.sourceforge.net/scummvm/?rev=47951&view=rev
Author:   thebluegr
Date:     2010-02-07 09:33:53 +0000 (Sun, 07 Feb 2010)

Log Message:
-----------
With the new detection for setCursor, the game object and game ID are no longer required, which makes some ugly code obsolete. Yay! :)

Modified Paths:
--------------
    scummvm/trunk/engines/sci/engine/features.cpp
    scummvm/trunk/engines/sci/engine/features.h
    scummvm/trunk/engines/sci/engine/savegame.cpp
    scummvm/trunk/engines/sci/sci.cpp

Modified: scummvm/trunk/engines/sci/engine/features.cpp
===================================================================
--- scummvm/trunk/engines/sci/engine/features.cpp	2010-02-07 04:25:05 UTC (rev 47950)
+++ scummvm/trunk/engines/sci/engine/features.cpp	2010-02-07 09:33:53 UTC (rev 47951)
@@ -43,11 +43,6 @@
 	_usesCdTrack = Common::File::exists("cdaudio.map");
 }
 
-void GameFeatures::setGameInfo(reg_t gameObj, Common::String gameId) {
-	_gameObj = gameObj;
-	_gameId = gameId;
-}
-
 bool GameFeatures::autoDetectFeature(FeatureDetection featureDetection, int methodNum) {
 	Common::String objName;
 	Selector slc = 0;

Modified: scummvm/trunk/engines/sci/engine/features.h
===================================================================
--- scummvm/trunk/engines/sci/engine/features.h	2010-02-07 04:25:05 UTC (rev 47950)
+++ scummvm/trunk/engines/sci/engine/features.h	2010-02-07 09:33:53 UTC (rev 47951)
@@ -44,8 +44,6 @@
 	GameFeatures(SegManager *segMan, Kernel *kernel);
 	~GameFeatures() {}
 
-	void setGameInfo(reg_t gameObj, Common::String gameId);
-
 	/**
 	 * Autodetects the DoSound type
 	 * @return DoSound type, SCI_VERSION_0_EARLY / SCI_VERSION_0_LATE /
@@ -111,8 +109,6 @@
 
 	SegManager *_segMan;
 	Kernel *_kernel;
-	reg_t _gameObj;
-	Common::String _gameId;
 };
 
 } // End of namespace Sci

Modified: scummvm/trunk/engines/sci/engine/savegame.cpp
===================================================================
--- scummvm/trunk/engines/sci/engine/savegame.cpp	2010-02-07 04:25:05 UTC (rev 47950)
+++ scummvm/trunk/engines/sci/engine/savegame.cpp	2010-02-07 09:33:53 UTC (rev 47951)
@@ -1014,8 +1014,6 @@
 	retval->successor = NULL;
 	retval->_gameId = s->_gameId;
 
-	retval->_features->setGameInfo(retval->_gameObj, retval->_gameId);
-
 #ifdef USE_OLD_MUSIC_FUNCTIONS
 	retval->_sound._it = NULL;
 	retval->_sound._flags = s->_sound._flags;

Modified: scummvm/trunk/engines/sci/sci.cpp
===================================================================
--- scummvm/trunk/engines/sci/sci.cpp	2010-02-07 04:25:05 UTC (rev 47950)
+++ scummvm/trunk/engines/sci/sci.cpp	2010-02-07 09:33:53 UTC (rev 47951)
@@ -216,8 +216,6 @@
 	assert(_gamestate->sys_strings->_strings[SYS_STRING_SAVEDIR]._value != 0);
 	strcpy(_gamestate->sys_strings->_strings[SYS_STRING_SAVEDIR]._value, "");
 
-	_gamestate->_features->setGameInfo(_gamestate->_gameObj, _gamestate->_gameId);
-
 	SciVersion soundVersion = _gamestate->_features->detectDoSoundType();
 
 	_gamestate->_soundCmd = new SoundCommandParser(_resMan, segMan, _kernel, _audio, soundVersion);


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