diff options
| author | Max Horn | 2003-08-05 17:50:06 +0000 |
|---|---|---|
| committer | Max Horn | 2003-08-05 17:50:06 +0000 |
| commit | 59bd4cb49316021a515df32ac4337f5ccad506bd (patch) | |
| tree | 5a00bd4f5ae919255298ea024285136b52996058 | |
| parent | 2e6865b8a3ba6397949ffb10604370736e7e9999 (diff) | |
| download | scummvm-rg350-59bd4cb49316021a515df32ac4337f5ccad506bd.tar.gz scummvm-rg350-59bd4cb49316021a515df32ac4337f5ccad506bd.tar.bz2 scummvm-rg350-59bd4cb49316021a515df32ac4337f5ccad506bd.zip | |
cleanup
svn-id: r9509
| -rw-r--r-- | scumm/scummvm.cpp | 11 |
1 files changed, 3 insertions, 8 deletions
diff --git a/scumm/scummvm.cpp b/scumm/scummvm.cpp index 3921705c8f..6775a5f3dc 100644 --- a/scumm/scummvm.cpp +++ b/scumm/scummvm.cpp @@ -612,24 +612,19 @@ Scumm::Scumm (GameDetector *detector, OSystem *syst) _mixer->setMusicVolume(kDefaultMusicVolume); // Init iMuse + _imuse = NULL; + _imuseDigital = NULL; + _playerV2 = NULL; if (_features & GF_DIGI_IMUSE) { _imuseDigital = new IMuseDigital(this); - _imuse = NULL; - _playerV2 = NULL; } else if ((_features & GF_AMIGA) && (_features & GF_OLD_BUNDLE)) { _playerV2 = NULL; - _imuse = NULL; - _imuseDigital = NULL; } else if (_features & GF_OLD_BUNDLE) { if ((_version == 1) && (_gameId == GID_MANIAC)) _playerV2 = NULL; else _playerV2 = new Player_V2(this); - _imuse = NULL; - _imuseDigital = NULL; } else { - _playerV2 = NULL; - _imuseDigital = NULL; _imuse = IMuse::create (syst, detector->createMidi()); if (_imuse) { if (detector->_gameTempo != 0) |