diff options
Diffstat (limited to 'engines/tinsel/sound.cpp')
| -rw-r--r-- | engines/tinsel/sound.cpp | 10 |
1 files changed, 3 insertions, 7 deletions
diff --git a/engines/tinsel/sound.cpp b/engines/tinsel/sound.cpp index cadc754de6..416ee74127 100644 --- a/engines/tinsel/sound.cpp +++ b/engines/tinsel/sound.cpp @@ -75,7 +75,7 @@ SoundManager::~SoundManager() { // playSample for DiscWorld 1 bool SoundManager::playSample(int id, Audio::Mixer::SoundType type, Audio::SoundHandle *handle) { // Floppy version has no sample file. - if (!_vm->isCD()) + if (!_vm->isV1CD()) return false; // no sample driver? @@ -207,10 +207,6 @@ void SoundManager::playDW1MacMusic(Common::File &s, uint32 length) { bool SoundManager::playSample(int id, int sub, bool bLooped, int x, int y, int priority, Audio::Mixer::SoundType type, Audio::SoundHandle *handle) { - // Floppy version has no sample file - if (!_vm->isCD()) - return false; - // no sample driver? if (!_vm->_mixer->isReady()) return false; @@ -501,8 +497,8 @@ void SoundManager::showSoundError(const char *errorMsg, const char *soundFile) { * Opens and inits all sound sample files. */ void SoundManager::openSampleFiles() { - // Floppy and demo versions have no sample files, except for the Discworld 2 demo - if (!_vm->isCD()) + // V1 Floppy and V0 demo versions have no sample files + if (TinselV0 || (TinselV1 && !_vm->isV1CD())) return; TinselFile f; |