diff options
| author | Joost Peters | 2004-01-24 22:55:09 +0000 |
|---|---|---|
| committer | Joost Peters | 2004-01-24 22:55:09 +0000 |
| commit | d40d9b7f0d2145b231538227b08ba20d8ba890a7 (patch) | |
| tree | 64d331d2594903d60173c846b4bbf863ae4c729d /queen/music.h | |
| parent | 6c8111bac92db1193489642d4ddbc04b52aafa5e (diff) | |
| download | scummvm-rg350-d40d9b7f0d2145b231538227b08ba20d8ba890a7.tar.gz scummvm-rg350-d40d9b7f0d2145b231538227b08ba20d8ba890a7.tar.bz2 scummvm-rg350-d40d9b7f0d2145b231538227b08ba20d8ba890a7.zip | |
- Added MT32 -> GM mapping, this fixes the wrong sound for the clock in the beginning as well as various tunes.
- Don't try to play invalid music (list probably is incomplete)
- Work around annoying notes bug in 2 pieces of Floda music
- Stop music when loading savegames
svn-id: r12584
Diffstat (limited to 'queen/music.h')
| -rw-r--r-- | queen/music.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/queen/music.h b/queen/music.h index f36dffb3b7..dd8a63ca91 100644 --- a/queen/music.h +++ b/queen/music.h @@ -66,6 +66,7 @@ protected: void queueUpdatePos(); uint8 randomQueuePos(); static void onTimer(void *data); + bool isBadSong(uint16 songNum); uint32 songOffset(uint16 songNum); uint32 songLength(uint16 songNum); @@ -81,6 +82,7 @@ protected: bool _randomLoop; byte _volume; uint8 _queuePos; + int16 _currentSong; int16 _lastSong; //first song from previous queue int16 _songQueue[MUSIC_QUEUE_SIZE]; |