diff options
| author | Torbjörn Andersson | 2010-08-11 15:36:29 +0000 |
|---|---|---|
| committer | Torbjörn Andersson | 2010-08-11 15:36:29 +0000 |
| commit | 416b56874490fae9aeba76bc7603313b59f24df7 (patch) | |
| tree | f6ac5df238ae63875348dc843701b224c3ee2f26 /engines/scumm/scumm.cpp | |
| parent | 10b6a395cf4665c115b3e8bb233bd8842acf1724 (diff) | |
| download | scummvm-rg350-416b56874490fae9aeba76bc7603313b59f24df7.tar.gz scummvm-rg350-416b56874490fae9aeba76bc7603313b59f24df7.tar.bz2 scummvm-rg350-416b56874490fae9aeba76bc7603313b59f24df7.zip | |
SCUMM: Re-enable PCjr music for Indy 3
Apart from adding the necessary detector flags, in cases where we used
to only check for PC Speaker we now also need to check for PCjr. Note
that I have only tested this with the VGA version. And even with that
one, I've only given it the briefest of tests.
svn-id: r51988
Diffstat (limited to 'engines/scumm/scumm.cpp')
| -rw-r--r-- | engines/scumm/scumm.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/engines/scumm/scumm.cpp b/engines/scumm/scumm.cpp index 30ec40b026..d72306abc3 100644 --- a/engines/scumm/scumm.cpp +++ b/engines/scumm/scumm.cpp @@ -1745,7 +1745,7 @@ void ScummEngine::setupMusic(int midi) { _musicEngine = new Player_V1(this, _mixer, MidiDriver::getMusicType(dev) != MT_PCSPK); } else if (_game.version <= 2) { _musicEngine = new Player_V2(this, _mixer, MidiDriver::getMusicType(dev) != MT_PCSPK); - } else if ((_musicType == MDT_PCSPK) && (_game.version > 2 && _game.version <= 4)) { + } else if ((_musicType == MDT_PCSPK || _musicType == MDT_PCJR) && (_game.version > 2 && _game.version <= 4)) { _musicEngine = new Player_V2(this, _mixer, MidiDriver::getMusicType(dev) != MT_PCSPK); } else if (_musicType == MDT_CMS) { _musicEngine = new Player_V2CMS(this, _mixer); |