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

[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:
b60f967eaf BLADERUNNER: Don't spare Zuben if he hits McCoy


Commit: b60f967eafeb90903f860ecd8071fcee1b4e0abb
    https://github.com/scummvm/scummvm/commit/b60f967eafeb90903f860ecd8071fcee1b4e0abb
Author: antoniou79 (a.antoniou79 at gmail.com)
Date: 2023-05-05T10:16:38+03:00

Commit Message:
BLADERUNNER: Don't spare Zuben if he hits McCoy

Original engine bug. Zuben could slash McCoy multiple times and McCoy would still spare him.

Re-uses the kFlagMcCoyShotAtZuben flag that prevents McCoy from sparing Zuben.

Changed paths:
    engines/bladerunner/script/ai/zuben.cpp


diff --git a/engines/bladerunner/script/ai/zuben.cpp b/engines/bladerunner/script/ai/zuben.cpp
index a7639829a3c..5e190f23685 100644
--- a/engines/bladerunner/script/ai/zuben.cpp
+++ b/engines/bladerunner/script/ai/zuben.cpp
@@ -19,6 +19,7 @@
  *
  */
 
+#include "bladerunner/bladerunner.h"
 #include "bladerunner/script/ai_script.h"
 
 namespace BladeRunner {
@@ -784,6 +785,16 @@ bool AIScriptZuben::UpdateAnimation(int *animation, int *frame) {
 
 		if (_animationFrame == 11) {
 			Actor_Combat_AI_Hit_Attempt(kActorZuben);
+#if !BLADERUNNER_ORIGINAL_BUGS
+			if (Game_Flag_Query(kFlagCT07ZubenAttack)
+			    && !Game_Flag_Query(kFlagMcCoyShotAtZuben)) {
+				// We re-use the flag that indicates that McCoy shot at Zuben,
+				// even though here it's Zuben who hits McCoy.
+				// This should be fine, since it serves the same purpose:
+				// McCoy can no longer spare Zuben if he holsters his gun.
+				Game_Flag_Set(kFlagMcCoyShotAtZuben);
+			}
+#endif // BLADERUNNER_ORIGINAL_BUGS
 		}
 
 		if (_animationFrame >= Slice_Animation_Query_Number_Of_Frames(*animation)) {