aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTorbjörn Andersson2005-07-19 20:25:48 +0000
committerTorbjörn Andersson2005-07-19 20:25:48 +0000
commit993c262e2bf21e4e1d7b1fa6a73ed5302bc9a9d7 (patch)
treefdeea1fafc3a97ab13f4d08c759b5951203d5f10
parent6904278e231b03f566fb0203d966a6eeaa3185b1 (diff)
downloadscummvm-rg350-993c262e2bf21e4e1d7b1fa6a73ed5302bc9a9d7.tar.gz
scummvm-rg350-993c262e2bf21e4e1d7b1fa6a73ed5302bc9a9d7.tar.bz2
scummvm-rg350-993c262e2bf21e4e1d7b1fa6a73ed5302bc9a9d7.zip
Cleanup.
svn-id: r18563
-rw-r--r--saga/music.cpp9
1 files changed, 0 insertions, 9 deletions
diff --git a/saga/music.cpp b/saga/music.cpp
index f01a86451f..35d53d2708 100644
--- a/saga/music.cpp
+++ b/saga/music.cpp
@@ -349,12 +349,6 @@ bool Music::isPlaying() {
return _mixer->isSoundHandleActive(_musicHandle) || _player->isPlaying();
}
-// The Wyrmkeep release of Inherit The Earth features external MIDI files, so
-// we need a mapping from resource number to filename.
-//
-// reset.mid seems to be unused.
-
-
void Music::play(uint32 resourceId, MusicFlags flags) {
AudioStream *audioStream = NULL;
MidiParser *parser;
@@ -377,7 +371,6 @@ void Music::play(uint32 resourceId, MusicFlags flags) {
_mixer->stopHandle(_musicHandle);
-
if (_vm->getGameType() == GType_ITE) {
if (resourceId >= 9 && resourceId <= 34) {
@@ -389,7 +382,6 @@ void Music::play(uint32 resourceId, MusicFlags flags) {
}
}
-
if (_musicContext != NULL) {
//TODO: check resource size
audioStream = new RAWInputStream(_vm, _musicContext, resourceId, flags == MUSIC_LOOP);
@@ -397,7 +389,6 @@ void Music::play(uint32 resourceId, MusicFlags flags) {
}
}
-
if (audioStream) {
debug(2, "Playing digitized music");
_mixer->playInputStream(Audio::Mixer::kMusicSoundType, &_musicHandle, audioStream);