aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMax Horn2008-07-08 10:29:35 +0000
committerMax Horn2008-07-08 10:29:35 +0000
commitdadb771cdcdba41c795053b5115f04109b8fd545 (patch)
tree5f0f2a460c8d7ac9d94cb9c9f03f22fb89ad3d9f
parente74d01a59a17894a85723db3b9af4dacac659336 (diff)
downloadscummvm-rg350-dadb771cdcdba41c795053b5115f04109b8fd545.tar.gz
scummvm-rg350-dadb771cdcdba41c795053b5115f04109b8fd545.tar.bz2
scummvm-rg350-dadb771cdcdba41c795053b5115f04109b8fd545.zip
Remove reference to kPlainSoundType
svn-id: r32960
-rw-r--r--engines/scumm/imuse_digi/dimuse_track.h4
1 files changed, 3 insertions, 1 deletions
diff --git a/engines/scumm/imuse_digi/dimuse_track.h b/engines/scumm/imuse_digi/dimuse_track.h
index 33147128cb..2d4c673cf6 100644
--- a/engines/scumm/imuse_digi/dimuse_track.h
+++ b/engines/scumm/imuse_digi/dimuse_track.h
@@ -85,13 +85,15 @@ struct Track {
int getPan() const { return (pan != 64) ? 2 * pan - 127 : 0; }
int getVol() const { return vol / 1000; }
Audio::Mixer::SoundType getType() const {
- Audio::Mixer::SoundType type = Audio::Mixer::kPlainSoundType;
+ Audio::Mixer::SoundType type;
if (volGroupId == 1)
type = Audio::Mixer::kSpeechSoundType;
else if (volGroupId == 2)
type = Audio::Mixer::kSFXSoundType;
else if (volGroupId == 3)
type = Audio::Mixer::kMusicSoundType;
+ else
+ error("Track::getType(): invalid sound type");
return type;
}
};