aboutsummaryrefslogtreecommitdiff
path: root/engines/scumm
diff options
context:
space:
mode:
authorTorbjörn Andersson2010-08-11 15:16:55 +0000
committerTorbjörn Andersson2010-08-11 15:16:55 +0000
commit10b6a395cf4665c115b3e8bb233bd8842acf1724 (patch)
tree1c51bb150e793c096acd1964149a12440ec2a2ca /engines/scumm
parent1302ccb464964ca806343d85fd3d128df0a839de (diff)
downloadscummvm-rg350-10b6a395cf4665c115b3e8bb233bd8842acf1724.tar.gz
scummvm-rg350-10b6a395cf4665c115b3e8bb233bd8842acf1724.tar.bz2
scummvm-rg350-10b6a395cf4665c115b3e8bb233bd8842acf1724.zip
SCUMM: Add missing case in sound initialisation
If the mixer isn't ready, we probably have to check for PCjr as well, so add that case. svn-id: r51987
Diffstat (limited to 'engines/scumm')
-rw-r--r--engines/scumm/scumm.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/engines/scumm/scumm.cpp b/engines/scumm/scumm.cpp
index 737343cebe..30ec40b026 100644
--- a/engines/scumm/scumm.cpp
+++ b/engines/scumm/scumm.cpp
@@ -1711,7 +1711,7 @@ void ScummEngine::setupMusic(int midi) {
* automatically when samples need to be generated */
if (!_mixer->isReady()) {
warning("Sound mixer initialization failed");
- if (_musicType == MDT_ADLIB || _musicType == MDT_PCSPK || _musicType == MDT_CMS) {
+ if (_musicType == MDT_ADLIB || _musicType == MDT_PCSPK || _musicType == MDT_PCJR || _musicType == MDT_CMS) {
dev = 0;
_musicType = MDT_NONE;
warning("MIDI driver depends on sound mixer, switching to null MIDI driver");