libretro/scummvm
1
0
Fork 0
mirror of https://github.com/libretro/scummvm.git synced 2025-01-09 11:20:56 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

MOHAWK: MYST: Make changeBackgroundSound wait for the effect to complete

Browse Source 
Fixes #10489.
This commit is contained in:
Bastien Bouclet 2018-04-15 06:17:45 +02:00
parent 85c802c9b7
commit b1f927f105
2 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
engines/mohawk/myst_scripts.cpp
View File

@ -625,6 +625,8 @@ void MystScriptParser::o_copyImageToBackBuffer(uint16 var, const ArgumentsArray
}
void MystScriptParser::o_changeBackgroundSound(uint16 var, const ArgumentsArray &args) {
soundWaitStop();
// Used on Stoneship Card 2080
// Used on Channelwood Card 3225 with argc = 8 i.e. Conditional Sound List
Common::MemoryWriteStreamDynamic writeStream = Common::MemoryWriteStreamDynamic(DisposeAfterUse::YES);
@ -787,12 +789,16 @@ void MystScriptParser::o_soundWaitStop(uint16 var, const ArgumentsArray &args) {
// Used on Selenitic Card 1191 (Maze Runner)
// Used on Mechanical Card 6267 (Code Lock)
// Used when Button is pushed...
while (_vm->_sound->isEffectPlaying())
soundWaitStop();
}
void MystScriptParser::soundWaitStop() const {
while (_vm->_sound->isEffectPlaying() && !Engine::shouldQuit())
_vm->doFrame();
}
void MystScriptParser::o_quit(uint16 var, const ArgumentsArray &args) {
_vm->quitGame();
Engine::quitGame();
}
void MystScriptParser::showMap() {

1
engines/mohawk/myst_scripts.h
View File

@ -87,6 +87,7 @@ public:
void showMap();
void animatedUpdate(const ArgumentsArray &args, uint16 delay);
void soundWaitStop() const;
// Common opcodes
DECLARE_OPCODE(o_toggleVar);