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 /simon | |
| 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 'simon')
| -rw-r--r-- | simon/simon.cpp | 4 | ||||
| -rw-r--r-- | simon/simon.h | 2 |
2 files changed, 4 insertions, 2 deletions
diff --git a/simon/simon.cpp b/simon/simon.cpp index b85af55979..55c9c0209c 100644 --- a/simon/simon.cpp +++ b/simon/simon.cpp @@ -234,7 +234,7 @@ static const GameSpecificSettings simon2dos_settings = { SimonEngine::SimonEngine(GameDetector *detector, OSystem *syst) - : Engine(detector, syst), midi (syst) { + : Engine(syst), midi (syst) { _vc_ptr = 0; _game_offsets_ptr = 0; @@ -507,7 +507,7 @@ SimonEngine::SimonEngine(GameDetector *detector, OSystem *syst) set_volume(ConfMan.getInt("sfx_volume")); // Setup midi driver - MidiDriver *driver = detector->createMidi(GameDetector::detectMusicDriver(detector->_game.midi)); + MidiDriver *driver = GameDetector::createMidi(GameDetector::detectMusicDriver(detector->_game.midi)); if (!driver) driver = MidiDriver_ADLIB_create(_mixer); else if (ConfMan.getBool("native_mt32")) diff --git a/simon/simon.h b/simon/simon.h index bd386eaba1..7f49dc8e84 100644 --- a/simon/simon.h +++ b/simon/simon.h @@ -29,6 +29,8 @@ #include "sound/mixer.h" #include "simon/sound.h" +class GameDetector; + namespace Simon { /* Various other settings */ |