diff options
author | Filippos Karapetis | 2010-02-07 09:33:53 +0000 |
---|---|---|
committer | Filippos Karapetis | 2010-02-07 09:33:53 +0000 |
commit | 3c8ab42eea676fb2861e78261de0ad75287f5837 (patch) | |
tree | 1b3af81960c782c7dc5cfa3aedd11dbb7c0b9644 /engines/sci/engine | |
parent | 9183ab57a3c260fda721b4eb3103f707be0ea16a (diff) | |
download | scummvm-rg350-3c8ab42eea676fb2861e78261de0ad75287f5837.tar.gz scummvm-rg350-3c8ab42eea676fb2861e78261de0ad75287f5837.tar.bz2 scummvm-rg350-3c8ab42eea676fb2861e78261de0ad75287f5837.zip |
With the new detection for setCursor, the game object and game ID are no longer required, which makes some ugly code obsolete. Yay! :)
svn-id: r47951
Diffstat (limited to 'engines/sci/engine')
-rw-r--r-- | engines/sci/engine/features.cpp | 5 | ||||
-rw-r--r-- | engines/sci/engine/features.h | 4 | ||||
-rw-r--r-- | engines/sci/engine/savegame.cpp | 2 |
3 files changed, 0 insertions, 11 deletions
diff --git a/engines/sci/engine/features.cpp b/engines/sci/engine/features.cpp index 4ada9fbeea..736a125b88 100644 --- a/engines/sci/engine/features.cpp +++ b/engines/sci/engine/features.cpp @@ -43,11 +43,6 @@ GameFeatures::GameFeatures(SegManager *segMan, Kernel *kernel) : _segMan(segMan) _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; diff --git a/engines/sci/engine/features.h b/engines/sci/engine/features.h index caa2ae11da..e647827f0f 100644 --- a/engines/sci/engine/features.h +++ b/engines/sci/engine/features.h @@ -44,8 +44,6 @@ public: 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 @@ private: SegManager *_segMan; Kernel *_kernel; - reg_t _gameObj; - Common::String _gameId; }; } // End of namespace Sci diff --git a/engines/sci/engine/savegame.cpp b/engines/sci/engine/savegame.cpp index af3637f43e..e5020fa2c4 100644 --- a/engines/sci/engine/savegame.cpp +++ b/engines/sci/engine/savegame.cpp @@ -1014,8 +1014,6 @@ void gamestate_restore(EngineState *s, Common::SeekableReadStream *fh) { 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; |