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/journal.cpp | |
| 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/journal.cpp')
| -rw-r--r-- | queen/journal.cpp | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/queen/journal.cpp b/queen/journal.cpp index c4400e08b3..88f70f3cb8 100644 --- a/queen/journal.cpp +++ b/queen/journal.cpp @@ -27,6 +27,7 @@ #include "queen/graphics.h" #include "queen/grid.h" #include "queen/logic.h" +#include "queen/music.h" #include "queen/queen.h" #include "queen/resource.h" #include "queen/sound.h" @@ -284,6 +285,7 @@ void Journal::handleYesNoMode(int16 zoneNum) { if (_saveDescriptions[currentSlot][0]) { _vm->graphics()->clearBobs(); _vm->display()->palFadeOut(0, 223, JOURNAL_ROOM); + _vm->music()->stopSong(); _vm->loadGameState(currentSlot); _vm->display()->clearTexts(0, GAME_SCREEN_HEIGHT - 1); // XXX panelflag=1; |