aboutsummaryrefslogtreecommitdiff
path: root/engines/tinsel/sound.cpp
diff options
context:
space:
mode:
authorFilippos Karapetis2012-07-15 14:55:06 +0300
committerFilippos Karapetis2012-07-15 14:55:06 +0300
commitd4a354c17f811faa916bf548a11a88cb51c3b7b2 (patch)
treeef1a578330225e4e62e56732a896c70259485db2 /engines/tinsel/sound.cpp
parentbd09eb06557514b4e68e6dc915cd71976af677bb (diff)
downloadscummvm-rg350-d4a354c17f811faa916bf548a11a88cb51c3b7b2.tar.gz
scummvm-rg350-d4a354c17f811faa916bf548a11a88cb51c3b7b2.tar.bz2
scummvm-rg350-d4a354c17f811faa916bf548a11a88cb51c3b7b2.zip
TINSEL: Remove the GF_CD and GF_FLOPPY flags
Diffstat (limited to 'engines/tinsel/sound.cpp')
-rw-r--r--engines/tinsel/sound.cpp6
1 files changed, 3 insertions, 3 deletions
diff --git a/engines/tinsel/sound.cpp b/engines/tinsel/sound.cpp
index f0ad62a091..e052302cfd 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->getFeatures() & GF_FLOPPY)
+ if (!_vm->isCD())
return false;
// no sample driver?
@@ -182,7 +182,7 @@ bool SoundManager::playSample(int id, int sub, bool bLooped, int x, int y, int p
Audio::Mixer::SoundType type, Audio::SoundHandle *handle) {
// Floppy version has no sample file
- if (_vm->getFeatures() & GF_FLOPPY)
+ if (!_vm->isCD())
return false;
// no sample driver?
@@ -471,7 +471,7 @@ void SoundManager::setSFXVolumes(uint8 volume) {
*/
void SoundManager::openSampleFiles() {
// Floppy and demo versions have no sample files, except for the Discworld 2 demo
- if (_vm->getFeatures() & GF_FLOPPY || TinselV0)
+ if (!_vm->isCD() || TinselV0)
return;
TinselFile f;