[Scummvm-git-logs] scummvm master -> 0380f01e07a252fd068a64dffad715fa0ed8c116

[antoniou79]

This automated email contains information about 1 new commit which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .

Summary:
0380f01e07 BLADERUNNER: Fix 2x scaling for non-interactive demo


Commit: 0380f01e07a252fd068a64dffad715fa0ed8c116
    https://github.com/scummvm/scummvm/commit/0380f01e07a252fd068a64dffad715fa0ed8c116
Author: antoniou79 (a.antoniou79 at gmail.com)
Date: 2025-01-24T13:36:04+02:00

Commit Message:
BLADERUNNER: Fix 2x scaling for non-interactive demo

Fixes bug https://bugs.scummvm.org/ticket/15713

Changed paths:
    engines/bladerunner/outtake.cpp


diff --git a/engines/bladerunner/outtake.cpp b/engines/bladerunner/outtake.cpp
index 989e99c3334..92893afa5d1 100644
--- a/engines/bladerunner/outtake.cpp
+++ b/engines/bladerunner/outtake.cpp
@@ -72,13 +72,21 @@ void OuttakePlayer::play(const Common::String &name, bool noLocalization, int co
 
 	VQAPlayer vqaPlayer(_vm, &_surfaceVideo, resNameNoVQASuffix + ".VQA"); // in original game _surfaceFront is used here, but for proper subtitles rendering we need separate surface
 
+	vqaPlayer.open();
+
+	// NOTE: The VQAPlayer::open():
+	// - calls VQAPlayer::close(), and that calls VQADecoder::close(), at its start to cleanup any previous state.
+	// - later it calls _decoder.loadStream() which also calls VQADecoder::close().
+	// Since VQADecoder::close() cleans up (deletes) the VQPTable,
+	// we need to do the allocation for it and loading of its values here, *after* vqaPlayer.open().
+	// The parsing of the VQP files is needed for the case of the non-interactive Blade Runner demo
+	// and the support of other old VQA files that have accompanying VQP files (eg. for demo reels for other Westwood games)
 	if (container == -2) {
 		// container value: -2 indicates potential existence of VQP file
 		if (!vqaPlayer.loadVQPTable(resNameNoVQASuffix + ".VQP")) {
 			debug("Unable to load VQP table");
 		}
 	}
-	vqaPlayer.open();
 
 	_vm->_vqaIsPlaying = true;
 	_vm->_vqaStopIsRequested = false;