[Scummvm-git-logs] scummvm master -> df8b73cfa906b31971f86ce99c69d3cf187a0c55

[antoniou79]

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

Summary:
fb4d59c9f8 BLADERUNNER: Fix regression in zbuffer
df8b73cfa9 BLADERUNNER: Fix overlay queuing in BB07


Commit: fb4d59c9f8e5aa2861acacfb8c754928f0e68447
    https://github.com/scummvm/scummvm/commit/fb4d59c9f8e5aa2861acacfb8c754928f0e68447
Author: antoniou79 (a.antoniou79 at gmail.com)
Date: 2023-05-17T14:28:10+03:00

Commit Message:
BLADERUNNER: Fix regression in zbuffer

Spotted in transitions to BB51, cause by bad memcpy size copied

Changed paths:
    engines/bladerunner/zbuffer.cpp


diff --git a/engines/bladerunner/zbuffer.cpp b/engines/bladerunner/zbuffer.cpp
index 843e6c3b6e7..df961ea704c 100644
--- a/engines/bladerunner/zbuffer.cpp
+++ b/engines/bladerunner/zbuffer.cpp
@@ -166,9 +166,9 @@ bool ZBuffer::decodeData(const uint8 *data, int size) {
 		memcpy(_zbuf2, _zbuf1, 2 * _width * _height);
 	} else {
 		clean();
-		decodePartialZBuffer(data, _zbuf1, size);
-		//decodePartialZBuffer(data, _zbuf2, size);
-		memcpy(_zbuf2, _zbuf1, size);
+		int sizeDecodedUint16 = decodePartialZBuffer(data, _zbuf1, size);
+//		decodePartialZBuffer(data, _zbuf2, size);
+		memcpy(_zbuf2, _zbuf1, sizeDecodedUint16 * sizeof(uint16));
 	}
 
 	return true;


Commit: df8b73cfa906b31971f86ce99c69d3cf187a0c55
    https://github.com/scummvm/scummvm/commit/df8b73cfa906b31971f86ce99c69d3cf187a0c55
Author: antoniou79 (a.antoniou79 at gmail.com)
Date: 2023-05-17T14:32:11+03:00

Commit Message:
BLADERUNNER: Fix overlay queuing in BB07

For the computer monitor when turned on

Changed paths:
    engines/bladerunner/script/scene/bb07.cpp


diff --git a/engines/bladerunner/script/scene/bb07.cpp b/engines/bladerunner/script/scene/bb07.cpp
index 7c45387e16e..56039b6ce1d 100644
--- a/engines/bladerunner/script/scene/bb07.cpp
+++ b/engines/bladerunner/script/scene/bb07.cpp
@@ -153,7 +153,12 @@ bool SceneScriptBB07::ClickedOn2DRegion(int region) {
 			Actor_Face_Heading(kActorMcCoy, 229, false);
 			if (!Game_Flag_Query(kFlagBB07ElectricityOn)) {
 				Ambient_Sounds_Play_Sound(kSfxCOMPON1, 40, 20, 20, 99);
+#if BLADERUNNER_ORIGINAL_BUGS
 				Overlay_Play("BB07OVER", 1, false, true, 0);
+#else
+				// Setting loopForever to true enables queuing (even though the loop will only play once)
+				Overlay_Play("BB07OVER", 1, true, true, 0);
+#endif // BLADERUNNER_ORIGINAL_BUGS
 				Overlay_Play("BB07OVER", 2, true, false, 0);
 				Game_Flag_Set(kFlagBB07ElectricityOn);
 				if (!Game_Flag_Query(kFlagBB07PrinterChecked)) {