diff options
| author | Robert Göffringmann | 2003-05-29 23:15:36 +0000 |
|---|---|---|
| committer | Robert Göffringmann | 2003-05-29 23:15:36 +0000 |
| commit | c1dfd566d5c579cb4a58deec2e1e0b2791e45bfd (patch) | |
| tree | c4ab0461ed566f8d9f92ef54e87ea7b8f9889031 /sky | |
| parent | 06ab068a4190595d186cbb00bb6af9dfba731d28 (diff) | |
| download | scummvm-rg350-c1dfd566d5c579cb4a58deec2e1e0b2791e45bfd.tar.gz scummvm-rg350-c1dfd566d5c579cb4a58deec2e1e0b2791e45bfd.tar.bz2 scummvm-rg350-c1dfd566d5c579cb4a58deec2e1e0b2791e45bfd.zip | |
stop sounds when escaping intro
svn-id: r8120
Diffstat (limited to 'sky')
| -rw-r--r-- | sky/cd_intro.cpp | 2 | ||||
| -rw-r--r-- | sky/intro.cpp | 3 |
2 files changed, 3 insertions, 2 deletions
diff --git a/sky/cd_intro.cpp b/sky/cd_intro.cpp index d5abd7a891..cf90414c50 100644 --- a/sky/cd_intro.cpp +++ b/sky/cd_intro.cpp @@ -195,7 +195,7 @@ #define LOAD_NEW_VOICE(num) ( free (vocBuffer), vocBuffer = _skyDisk->loadFile(num, NULL), loadedVocSize = _skyDisk->_lastLoadedFileSize ) #define LOAD_NEW_BG(num) ( free (bgVocBuffer), bgVocBuffer = _skyDisk->loadFile(num, NULL), bgVocSize = _skyDisk->_lastLoadedFileSize ) #define WAIT_VOICE while (_skySound->_voiceHandle != 0) { delay(50); CHECK_ESC } -#define CHECK_ESC if (_key_pressed == 27) { _skyScreen->stopSequence(); return; } +#define CHECK_ESC if (_key_pressed == 27) { _skyScreen->stopSequence(); _mixer->stopAll(); return; } #define WAIT_SEQUENCE while (_skyScreen->sequenceRunning()) { delay(50); CHECK_ESC } #define WAIT_RELATIVE(x) ( delay(20 * (x)) ) diff --git a/sky/intro.cpp b/sky/intro.cpp index 40de7526d4..d136ddf299 100644 --- a/sky/intro.cpp +++ b/sky/intro.cpp @@ -28,7 +28,8 @@ #define FREE_IF_NOT_0(ptr) if (ptr != NULL) { free (ptr); ptr = 0; } #define REMOVE_INTRO commandPtr = (uint32 *)zeroCommands; \ FREE_IF_NOT_0(_introTextSpace) \ - FREE_IF_NOT_0(_introTextSave) + FREE_IF_NOT_0(_introTextSave) \ + _mixer->stopAll(); #define CHECK_ESC if (_key_pressed == 27) { _skyScreen->stopSequence(); REMOVE_INTRO return; } #define WAIT_SEQUENCE while (_skyScreen->sequenceRunning()) { checkCommands(commandPtr); delay(50); CHECK_ESC } |