diff options
author | Max Horn | 2003-11-10 01:04:12 +0000 |
---|---|---|
committer | Max Horn | 2003-11-10 01:04:12 +0000 |
commit | e34f2b8b3321a576c2ae612470d07cb3e7bc91f5 (patch) | |
tree | 350146bd56be39f91232ed50f7fa2d3330011ab3 /scumm | |
parent | 63c6944492ad4bfa0ffbc811e4d1bad9f8452008 (diff) | |
download | scummvm-rg350-e34f2b8b3321a576c2ae612470d07cb3e7bc91f5.tar.gz scummvm-rg350-e34f2b8b3321a576c2ae612470d07cb3e7bc91f5.tar.bz2 scummvm-rg350-e34f2b8b3321a576c2ae612470d07cb3e7bc91f5.zip |
cut down on unnecessary GameDetector references
svn-id: r11239
Diffstat (limited to 'scumm')
-rw-r--r-- | scumm/scummvm.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/scumm/scummvm.cpp b/scumm/scummvm.cpp index d339129793..691072affc 100644 --- a/scumm/scummvm.cpp +++ b/scumm/scummvm.cpp @@ -285,7 +285,7 @@ static const ScummGameSettings scumm_settings[] = { }; ScummEngine::ScummEngine(GameDetector *detector, OSystem *syst, const ScummGameSettings &gs) - : Engine(detector, syst), + : Engine(syst), _gameId(gs.id), _version(gs.version), _features(gs.features), @@ -688,7 +688,7 @@ ScummEngine::ScummEngine(GameDetector *detector, OSystem *syst, const ScummGameS } else if (((_midiDriver == MD_PCJR) || (_midiDriver == MD_PCSPK)) && ((_version > 2) && (_version < 5))) { _musicEngine = new Player_V2(this, _midiDriver != MD_PCSPK); } else if (_version > 2) { - MidiDriver *driver = detector->createMidi(_midiDriver); + MidiDriver *driver = GameDetector::createMidi(_midiDriver); if (driver && _native_mt32) driver->property (MidiDriver::PROP_CHANNEL_MASK, 0x03FE); _musicEngine = _imuse = IMuse::create(syst, _mixer, driver); @@ -2795,12 +2795,12 @@ Engine *Engine_SCUMM_create(GameDetector *detector, OSystem *syst) { const ScummGameSettings *g = scumm_settings; while (g->gameName) { - if (!scumm_stricmp(detector->_game.gameName, g->gameName)) + if (!scumm_stricmp(detector->_gameName.c_str(), g->gameName)) break; g++; } if (!g->gameName) - error("Invalid game '%s'\n", detector->_game.gameName); + error("Invalid game '%s'\n", detector->_gameName.c_str()); ScummGameSettings game = *g; |