aboutsummaryrefslogtreecommitdiff
path: root/queen/sound.cpp
diff options
context:
space:
mode:
authorJoost Peters2004-01-22 23:10:05 +0000
committerJoost Peters2004-01-22 23:10:05 +0000
commit0bece175e485b4456cb966052662b38fe2147647 (patch)
tree8a089201660d90c4ab63b07c5a526f5eb11098a6 /queen/sound.cpp
parent99e3175d548d5dce704aaedab9ed291a4b365dae (diff)
downloadscummvm-rg350-0bece175e485b4456cb966052662b38fe2147647.tar.gz
scummvm-rg350-0bece175e485b4456cb966052662b38fe2147647.tar.bz2
scummvm-rg350-0bece175e485b4456cb966052662b38fe2147647.zip
- Some refactoring/clean-up.
- Handle special music types (> 1000) - Implemented random looping (untested) svn-id: r12577
Diffstat (limited to 'queen/sound.cpp')
-rw-r--r--queen/sound.cpp22
1 files changed, 2 insertions, 20 deletions
diff --git a/queen/sound.cpp b/queen/sound.cpp
index d9b3f92bdd..fa5c702e1f 100644
--- a/queen/sound.cpp
+++ b/queen/sound.cpp
@@ -123,26 +123,8 @@ void Sound::playSong(int16 songNum) {
_lastOverride = songNum;
- switch (_tune[newTune].mode) {
- //Random loop
- case 0:
- warning("Music: Random loop not yet supported (doing sequential loop instead)");
- //Sequential loop
- case 1:
- _vm->music()->loop(true);
- break;
- //Play once
- case 2:
- default:
- _vm->music()->loop(false);
- break;
- }
-
- _vm->music()->queueClear();
- int i = 0;
- while(_tune[newTune].tuneNum[i])
- _vm->music()->queueSong(_tune[newTune].tuneNum[i++] - 1);
- _vm->music()->playMusic();
+ _vm->music()->queueTuneList(newTune);
+ _vm->music()->playMusic();
}
void Sound::saveState(byte *&ptr) {