diff options
| author | Peter Kohaut | 2019-02-10 23:34:54 +0100 |
|---|---|---|
| committer | Peter Kohaut | 2019-02-11 22:48:07 +0100 |
| commit | b14fbaa72b3218862a533dd7f7c0e97e1bed4df7 (patch) | |
| tree | a35c91bfe2eac6b3f084ef5b8f80ed2d3b002aff /engines/bladerunner/script/script.cpp | |
| parent | 22e5913f18f597aab343ca4555714a340d86d3c8 (diff) | |
| download | scummvm-rg350-b14fbaa72b3218862a533dd7f7c0e97e1bed4df7.tar.gz scummvm-rg350-b14fbaa72b3218862a533dd7f7c0e97e1bed4df7.tar.bz2 scummvm-rg350-b14fbaa72b3218862a533dd7f7c0e97e1bed4df7.zip | |
BLADERUNNER: Cleanup of audio code
Separated audio cache.
Fixed bug in the audio cache where still used sound might get freed.
Fixes crashes when engine is unloading which were caused
by a race condition between the timer code and engine teardown code.
Diffstat (limited to 'engines/bladerunner/script/script.cpp')
| -rw-r--r-- | engines/bladerunner/script/script.cpp | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/engines/bladerunner/script/script.cpp b/engines/bladerunner/script/script.cpp index 4c205d5d4c..14f34c4946 100644 --- a/engines/bladerunner/script/script.cpp +++ b/engines/bladerunner/script/script.cpp @@ -335,9 +335,11 @@ void ScriptBase::Actor_Says_With_Pause(int actorId, int sentenceId, float pause, Sound_Play(Random_Query(319, 327), 40, 0, 0, 50); } } - if(pause > 0.0f && !_vm->_speechSkipped) { + + if (pause > 0.0f && !_vm->_speechSkipped) { Delay(pause * 1000); } + Player_Gains_Control(); } |