aboutsummaryrefslogtreecommitdiff
path: root/scumm/scummvm.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'scumm/scummvm.cpp')
-rw-r--r--scumm/scummvm.cpp11
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)