diff options
| author | Paul Gilbert | 2014-02-01 11:54:33 -0500 |
|---|---|---|
| committer | Paul Gilbert | 2014-02-01 11:54:33 -0500 |
| commit | 256bf62ee4d9822458a721c059fe4abbef8ca1df (patch) | |
| tree | d4a36ad3d29dc7d26162a8dbae319ee083a6e3c8 | |
| parent | 37402e06e5f55896f3bd8a7bf8a62bca16d1c7b1 (diff) | |
| download | scummvm-rg350-256bf62ee4d9822458a721c059fe4abbef8ca1df.tar.gz scummvm-rg350-256bf62ee4d9822458a721c059fe4abbef8ca1df.tar.bz2 scummvm-rg350-256bf62ee4d9822458a721c059fe4abbef8ca1df.zip | |
VOYEUR: Refactored audio scene playback, and fixed a crash at the end
| -rw-r--r-- | engines/voyeur/files_threads.cpp | 1 | ||||
| -rw-r--r-- | engines/voyeur/voyeur.cpp | 3 |
2 files changed, 2 insertions, 2 deletions
diff --git a/engines/voyeur/files_threads.cpp b/engines/voyeur/files_threads.cpp index 3e2fa6f7bc..8359cf88fb 100644 --- a/engines/voyeur/files_threads.cpp +++ b/engines/voyeur/files_threads.cpp @@ -391,6 +391,7 @@ void ThreadResource::parsePlayCommands() { _vm->_voy.addAudioEventEnd(); _vm->_eventsManager.incrementTime(1); _vm->_eventsManager.incrementTime(1); + _vm->_audioVideoId = -1; parseIndex = 999; } } diff --git a/engines/voyeur/voyeur.cpp b/engines/voyeur/voyeur.cpp index 932a38e60d..2898c16592 100644 --- a/engines/voyeur/voyeur.cpp +++ b/engines/voyeur/voyeur.cpp @@ -621,10 +621,9 @@ void VoyeurEngine::playAudio(int audioId) { _soundManager.stopVOCPlay(); _bVoy->freeBoltGroup(0x7F00); - flipPageAndWait(); + (*_graphicsManager._vPort)->setupViewPort(NULL); _voy._field478 &= ~0x10; - audioId = -1; _voy._field470 = 129; } |