diff options
| author | Jamieson Christian | 2003-08-15 07:45:21 +0000 |
|---|---|---|
| committer | Jamieson Christian | 2003-08-15 07:45:21 +0000 |
| commit | 6f50c852206cc8d85fe60b0014a14d73208cba6c (patch) | |
| tree | ad48e07d4d7175407452755938893da8f6c64b8f | |
| parent | c0730f6cb9d4485d0546a5e6fd909c485f4312fc (diff) | |
| download | scummvm-rg350-6f50c852206cc8d85fe60b0014a14d73208cba6c.tar.gz scummvm-rg350-6f50c852206cc8d85fe60b0014a14d73208cba6c.tar.bz2 scummvm-rg350-6f50c852206cc8d85fe60b0014a14d73208cba6c.zip | |
Fixed problem with Adlib sounds being generated
when using -epcspk or -epcjr with V6 games that
don't have PC speaker resources.
svn-id: r9701
| -rw-r--r-- | scumm/resource.cpp | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/scumm/resource.cpp b/scumm/resource.cpp index 0cc3918389..6163f89a85 100644 --- a/scumm/resource.cpp +++ b/scumm/resource.cpp @@ -710,9 +710,11 @@ int Scumm::readSoundResource(int type, int idx) { (char)((basetag >> 8) & 0xff), (char)(basetag & 0xff), total_size); if (basetag == MKID('MIDI') || basetag == MKID('iMUS')) { - _fileHandle.seek(-8, SEEK_CUR); - _fileHandle.read(createResource(type, idx, total_size + 8), total_size + 8); - return 1; + if (_midiDriver != MD_PCSPK && _midiDriver != MD_PCJR) { + _fileHandle.seek(-8, SEEK_CUR); + _fileHandle.read(createResource(type, idx, total_size + 8), total_size + 8); + return 1; + } } else if (basetag == MKID('SOU ')) { best_pri = -1; while (pos < total_size) { |