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

[antoniou79]

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

Summary:
ffe65087a8 BLADERUNNER: Include flag id 0 for cmdFlag()
3ef467dafc BLADERUNNER: Fix inconsistency for Guzza's quote in UG18
fbdee822db BLADERUNNER: CUTCONTENT: Restore Guzza quote in UG18


Commit: ffe65087a833043dc033551e6239cd0118725724
    https://github.com/scummvm/scummvm/commit/ffe65087a833043dc033551e6239cd0118725724
Author: antoniou79 (a.antoniou79 at gmail.com)
Date: 2022-10-14T11:33:28+03:00

Commit Message:
BLADERUNNER: Include flag id 0 for cmdFlag()

This is for the debugger. Flag 0 is not really used, but it exists and should be included.

We might re-use it for restored content in the future.

Changed paths:
    engines/bladerunner/debugger.cpp


diff --git a/engines/bladerunner/debugger.cpp b/engines/bladerunner/debugger.cpp
index e5f0ce8574e..8bb186717b3 100644
--- a/engines/bladerunner/debugger.cpp
+++ b/engines/bladerunner/debugger.cpp
@@ -455,7 +455,7 @@ bool Debugger::cmdFlag(int argc, const char **argv) {
 
 	int flag = atoi(argv[1]);
 	int flagCount = _vm->_gameInfo->getFlagCount();
-	if (flag > 0 && flag < flagCount) {
+	if (flag >= 0 && flag < flagCount) {
 		if (argc == 3) {
 			int value = atoi(argv[2]);
 			if (value == 0) {


Commit: 3ef467dafc633a46f0a6961210ee51fa31c40c1e
    https://github.com/scummvm/scummvm/commit/3ef467dafc633a46f0a6961210ee51fa31c40c1e
Author: antoniou79 (a.antoniou79 at gmail.com)
Date: 2022-10-14T11:33:28+03:00

Commit Message:
BLADERUNNER: Fix inconsistency for Guzza's quote in UG18

KIA clue kClueBriefcase plays this quote, but in-game dialogue was skipping it

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


diff --git a/engines/bladerunner/script/scene/ug18.cpp b/engines/bladerunner/script/scene/ug18.cpp
index 0036f5ebe95..368cdb369c4 100644
--- a/engines/bladerunner/script/scene/ug18.cpp
+++ b/engines/bladerunner/script/scene/ug18.cpp
@@ -519,6 +519,12 @@ void SceneScriptUG18::talkWithGuzza() {
 	Actor_Face_Actor(kActorGuzza, kActorMcCoy, true);
 	Actor_Start_Speech_Sample(kActorGuzza, 810);
 	Loop_Actor_Walk_To_XYZ(kActorGuzza, -57.21f, 0.0f, -334.17f, 0, false, false, false);
+#if !BLADERUNNER_ORIGINAL_BUGS
+	// Fix for inconsistency bug:
+	// This quote plays for the KIA clue (kClueBriefcase)
+	// but did not play during the actual in-game scene
+	Actor_Says(kActorGuzza, 820, 3);
+#endif // BLADERUNNER_ORIGINAL_BUGS
 	Actor_Says(kActorMcCoy, 5875, 13);
 	Actor_Says(kActorGuzza, 830, 3);
 	Actor_Says(kActorGuzza, 840, 12);


Commit: fbdee822dbf71e7a7daa3c0d37a1ed00c03959da
    https://github.com/scummvm/scummvm/commit/fbdee822dbf71e7a7daa3c0d37a1ed00c03959da
Author: antoniou79 (a.antoniou79 at gmail.com)
Date: 2022-10-14T11:33:28+03:00

Commit Message:
BLADERUNNER: CUTCONTENT: Restore Guzza quote in UG18

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


diff --git a/engines/bladerunner/script/scene/ug18.cpp b/engines/bladerunner/script/scene/ug18.cpp
index 368cdb369c4..97c200bebf9 100644
--- a/engines/bladerunner/script/scene/ug18.cpp
+++ b/engines/bladerunner/script/scene/ug18.cpp
@@ -552,6 +552,9 @@ void SceneScriptUG18::talkWithGuzza() {
 	Actor_Says(kActorGuzza, 900, 15);
 	Actor_Says(kActorGuzza, 910, 12);
 	Actor_Says(kActorGuzza, 920, 16);
+	if (_vm->_cutContent) {
+		Actor_Says(kActorGuzza, 930, 12);
+	}
 	Actor_Says(kActorMcCoy, 5925, 14);
 	Actor_Says(kActorGuzza, 940, 14);
 	Actor_Says(kActorMcCoy, 5930, 18);