libretro/scummvm
1
0
Fork 0
mirror of https://github.com/libretro/scummvm.git synced 2025-01-31 16:03:24 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

NANCY: Fix primary video chaining

Browse Source 
Fixed an issue where a piece of dialogue would start playing for a split
second before getting switched out with another.
This commit is contained in:
Kaloyan Chehlarski 2023-03-07 12:55:50 +02:00
parent 1fa1de39b6
commit fb7a903080
1 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
engines/nancy/action/primaryvideo.cpp
View File

@ -233,7 +233,10 @@ void PlayPrimaryVideoChan0::readData(Common::SeekableReadStream &stream) {
void PlayPrimaryVideoChan0::execute() { void PlayPrimaryVideoChan0::execute() {
PlayPrimaryVideoChan0 *activeVideo = NancySceneState.getActivePrimaryVideo(); PlayPrimaryVideoChan0 *activeVideo = NancySceneState.getActivePrimaryVideo();
if (activeVideo != this && activeVideo != nullptr) { if (activeVideo != this && activeVideo != nullptr) {
if (!activeVideo->_isDone) { if ( !activeVideo->_isDone ||
activeVideo->_defaultNextScene == kDefaultNextSceneEnabled ||
activeVideo->_pickedResponse != -1 ) {
return; return;
} else { } else {
// Chained videos, hide the previous one and start this // Chained videos, hide the previous one and start this