diff options
| author | Bastien Bouclet | 2017-07-09 18:33:24 +0200 |
|---|---|---|
| committer | Bastien Bouclet | 2017-07-22 20:38:56 +0200 |
| commit | 8f0fa86fbc88e324bdc5c8f4034056104a51003b (patch) | |
| tree | d545a09f3951928f10b6e5cb82a00e29f935a7b4 /engines/mohawk/myst_stacks | |
| parent | 3dd4da0c37e5c853e837b5b4af3ebff1536432f8 (diff) | |
| download | scummvm-rg350-8f0fa86fbc88e324bdc5c8f4034056104a51003b.tar.gz scummvm-rg350-8f0fa86fbc88e324bdc5c8f4034056104a51003b.tar.bz2 scummvm-rg350-8f0fa86fbc88e324bdc5c8f4034056104a51003b.zip | |
MOHAWK: Myst: Change blocking sounds to use the main loop
Diffstat (limited to 'engines/mohawk/myst_stacks')
| -rw-r--r-- | engines/mohawk/myst_stacks/mechanical.cpp | 10 | ||||
| -rw-r--r-- | engines/mohawk/myst_stacks/myst.cpp | 14 |
2 files changed, 12 insertions, 12 deletions
diff --git a/engines/mohawk/myst_stacks/mechanical.cpp b/engines/mohawk/myst_stacks/mechanical.cpp index 351379b01c..3bbf749c1f 100644 --- a/engines/mohawk/myst_stacks/mechanical.cpp +++ b/engines/mohawk/myst_stacks/mechanical.cpp @@ -611,7 +611,7 @@ void Mechanical::elevatorGoMiddle_run() { } // Blip - _vm->_sound->playSoundBlocking(14120); + _vm->playSoundBlocking(14120); // Restore button if (_elevatorInCabin) { @@ -626,11 +626,11 @@ void Mechanical::elevatorGoMiddle_run() { // Elevator going to middle animation _vm->_cursor->hideCursor(); - _vm->_sound->playSoundBlocking(11120); + _vm->playSoundBlocking(11120); _vm->_gfx->copyImageToBackBuffer(6118, Common::Rect(544, 333)); _vm->_sound->replaceSoundMyst(12120); _vm->_gfx->runTransition(kTransitionSlideToLeft, Common::Rect(177, 0, 370, 333), 25, 0); - _vm->_sound->playSoundBlocking(13120); + _vm->playSoundBlocking(13120); _vm->_sound->replaceSoundMyst(8120); _vm->_gfx->copyImageToBackBuffer(6327, Common::Rect(544, 333)); _vm->wait(500); @@ -866,7 +866,7 @@ void Mechanical::fortressRotation_run() { gears->seek(Audio::Timestamp(0, 1800 * (_fortressPosition % 2), 600)); } - _vm->_sound->playSoundBlocking(_fortressRotationSounds[_fortressPosition]); + _vm->playSoundBlocking(_fortressRotationSounds[_fortressPosition]); _gearsWereRunning = false; } @@ -1023,7 +1023,7 @@ void Mechanical::fortressSimulation_run() { // END HACK holo->seek(Audio::Timestamp(0, 1800 * simulationPosition, 600)); - _vm->_sound->playSoundBlocking( _fortressRotationSounds[simulationPosition]); + _vm->playSoundBlocking( _fortressRotationSounds[simulationPosition]); _gearsWereRunning = false; } diff --git a/engines/mohawk/myst_stacks/myst.cpp b/engines/mohawk/myst_stacks/myst.cpp index 6979ce5333..ff2415c6c5 100644 --- a/engines/mohawk/myst_stacks/myst.cpp +++ b/engines/mohawk/myst_stacks/myst.cpp @@ -902,12 +902,12 @@ void Myst::o_courtyardBoxesCheckSolution(uint16 op, uint16 var, uint16 argc, uin if (_state.courtyardImageBoxes == 50 && !_state.shipFloating) { _vm->_cursor->hideCursor(); _state.shipFloating = 1; - _vm->_sound->playSoundBlocking(soundId); + _vm->playSoundBlocking(soundId); _vm->_cursor->showCursor(); } else if (_state.courtyardImageBoxes != 50 && _state.shipFloating) { _vm->_cursor->hideCursor(); _state.shipFloating = 0; - _vm->_sound->playSoundBlocking(soundId); + _vm->playSoundBlocking(soundId); _vm->_cursor->showCursor(); } } @@ -1097,7 +1097,7 @@ void Myst::o_bookGivePage(uint16 op, uint16 var, uint16 argc, uint16 *argv) { } _vm->_cursor->hideCursor(); - _vm->_sound->playSoundBlocking(soundIdAddPage); + _vm->playSoundBlocking(soundIdAddPage); _vm->setMainCursor(kDefaultMystCursor); // Add page to book @@ -1269,11 +1269,11 @@ void Myst::o_imagerEraseButton(uint16 op, uint16 var, uint16 argc, uint16 *argv) return; } else if (_imagerValidationStep < 7) { // Too early - _vm->_sound->playSoundBlocking(_imagerSound[2]); + _vm->playSoundBlocking(_imagerSound[2]); _imagerValidationStep = 0; return; } else if (_imagerValidationStep < 11) { - _vm->_sound->playSoundBlocking(_imagerSound[3]); + _vm->playSoundBlocking(_imagerSound[3]); // Erase selected video from imager switch (_state.imagerSelection) { @@ -3375,12 +3375,12 @@ void Myst::libraryBookcaseTransform_run(void) { if (_state.libraryBookcaseDoor) { _vm->_gfx->copyImageSectionToBackBuffer(11179, Common::Rect(0, 0, 106, 81), Common::Rect(0, 72, 106, 153)); _vm->_gfx->runTransition(kTransitionBottomToTop, Common::Rect(0, 72, 106, 153), 5, 10); - _vm->_sound->playSoundBlocking(7348); + _vm->playSoundBlocking(7348); _vm->_sound->replaceBackgroundMyst(4348, 16384); } else { _vm->_gfx->copyImageSectionToBackBuffer(11178, Common::Rect(0, 0, 107, 67), Common::Rect(437, 84, 544, 151)); _vm->_gfx->copyBackBufferToScreen(Common::Rect(437, 84, 544, 151)); - _vm->_sound->playSoundBlocking(7348); + _vm->playSoundBlocking(7348); _vm->_sound->replaceBackgroundMyst(4334, 16384); } |