aboutsummaryrefslogtreecommitdiff
path: root/scumm/scumm.cpp
diff options
context:
space:
mode:
authorMax Horn2005-04-10 01:31:31 +0000
committerMax Horn2005-04-10 01:31:31 +0000
commit063fa83483b69c4e3758015ea81b0eaad8d978a5 (patch)
tree8aeef7a47e2bf05986de37728f29089cc3b86d62 /scumm/scumm.cpp
parentb40fa83d4134f13eefb360c173044159674d687c (diff)
downloadscummvm-rg350-063fa83483b69c4e3758015ea81b0eaad8d978a5.tar.gz
scummvm-rg350-063fa83483b69c4e3758015ea81b0eaad8d978a5.tar.bz2
scummvm-rg350-063fa83483b69c4e3758015ea81b0eaad8d978a5.zip
Init music engine within setupMusic(), even for V1 and V2 games
svn-id: r17498
Diffstat (limited to 'scumm/scumm.cpp')
-rw-r--r--scumm/scumm.cpp4
1 files changed, 4 insertions, 0 deletions
diff --git a/scumm/scumm.cpp b/scumm/scumm.cpp
index 80590af715..4e5387e622 100644
--- a/scumm/scumm.cpp
+++ b/scumm/scumm.cpp
@@ -1671,6 +1671,10 @@ void ScummEngine::setupMusic(int midi) {
_musicEngine = new Player_V3A(this);
} else if ((_features & GF_AMIGA) && (_version < 5)) {
_musicEngine = NULL;
+ } else if (_gameId == GID_MANIAC && (_version == 1)) {
+ _musicEngine = new Player_V1(this, _midiDriver != MD_PCSPK);
+ } else if (_version <= 2) {
+ _musicEngine = new Player_V2(this, _midiDriver != MD_PCSPK);;
} else if (((_midiDriver == MD_PCJR) || (_midiDriver == MD_PCSPK)) && ((_version > 2) && (_version < 5))) {
_musicEngine = new Player_V2(this, _midiDriver != MD_PCSPK);
} else if (_version > 2 && _heversion <= 60) {