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/sound.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/sound.cpp')
| -rw-r--r-- | engines/scumm/sound.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/engines/scumm/sound.cpp b/engines/scumm/sound.cpp index a845f623c2..61445b21eb 100644 --- a/engines/scumm/sound.cpp +++ b/engines/scumm/sound.cpp @@ -1134,7 +1134,7 @@ int ScummEngine::readSoundResource(int idx) { switch (basetag) { case MKID_BE('MIDI'): case MKID_BE('iMUS'): - if (_musicType != MDT_PCSPK) { + if (_musicType != MDT_PCSPK && _musicType != MDT_PCJR) { _fileHandle->seek(-8, SEEK_CUR); _fileHandle->read(_res->createResource(rtSound, idx, total_size + 8), total_size + 8); return 1; @@ -1177,12 +1177,12 @@ int ScummEngine::readSoundResource(int idx) { break; case MKID_BE('SPK '): pri = -1; -// if (_musicType == MDT_PCSPK) +// if (_musicType == MDT_PCSPK || _musicType == MDT_PCJR) // pri = 11; break; } - if ((_musicType == MDT_PCSPK || _musicType == MDT_CMS) && pri != 11) + if ((_musicType == MDT_PCSPK || _musicType == MDT_PCJR || _musicType == MDT_CMS) && pri != 11) pri = -1; debugC(DEBUG_RESOURCE, " tag: %s, total_size=%d, pri=%d", tag2str(tag), size, pri); @@ -2114,7 +2114,7 @@ int ScummEngine::readSoundResourceSmallHeader(int idx) { } } - if ((_musicType == MDT_PCSPK) && wa_offs != 0) { + if ((_musicType == MDT_PCSPK || _musicType == MDT_PCJR) && wa_offs != 0) { if (_game.features & GF_OLD_BUNDLE) { _fileHandle->seek(wa_offs, SEEK_SET); _fileHandle->read(_res->createResource(rtSound, idx, wa_size), wa_size); |