[Scummvm-git-logs] scummvm master -> 1c6905217e4c249a67a5ca289868e0fcc68ae9eb

[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:
1c6905217e BLADERUNNER: Marking cut content with BLADERUNNER_RESTORED_CUT_CONTENT macro


Commit: 1c6905217e4c249a67a5ca289868e0fcc68ae9eb
    https://github.com/scummvm/scummvm/commit/1c6905217e4c249a67a5ca289868e0fcc68ae9eb
Author: Thanasis Antoniou (a.antoniou79 at gmail.com)
Date: 2019-03-10T18:02:05+02:00

Commit Message:
BLADERUNNER: Marking cut content with BLADERUNNER_RESTORED_CUT_CONTENT macro

Enabled by default.

Currently, only restored content is the death rattle sound for Moraji and Zuben, and the dialogue of Guzza denying McCoy an advance

Changed paths:
    engines/bladerunner/bladerunner.h
    engines/bladerunner/script/ai/moraji.cpp
    engines/bladerunner/script/ai/zuben.cpp
    engines/bladerunner/script/scene/ps04.cpp


diff --git a/engines/bladerunner/bladerunner.h b/engines/bladerunner/bladerunner.h
index cee0804..8d26599 100644
--- a/engines/bladerunner/bladerunner.h
+++ b/engines/bladerunner/bladerunner.h
@@ -39,6 +39,8 @@
 #define BLADERUNNER_DEBUG_CONSOLE 0
 #define BLADERUNNER_ORIGINAL_SETTINGS 0
 #define BLADERUNNER_ORIGINAL_BUGS 0
+#define BLADERUNNER_RESTORED_CUT_CONTENT 1
+
 
 namespace Common {
 struct Event;
diff --git a/engines/bladerunner/script/ai/moraji.cpp b/engines/bladerunner/script/ai/moraji.cpp
index e1180a8..0023476 100644
--- a/engines/bladerunner/script/ai/moraji.cpp
+++ b/engines/bladerunner/script/ai/moraji.cpp
@@ -192,11 +192,10 @@ bool AIScriptMoraji::GoalChanged(int currentGoalNumber, int newGoalNumber) {
 		// Added check here  to have Moraji death speech SFX
 		// when shot by McCoy outside the Dermo Design Lab
 		if (Game_Flag_Query(kFlagDR04McCoyShotMoraji)) {
-#if BLADERUNNER_ORIGINAL_BUGS
-			// original code uses no voice here
-#else
+#if BLADERUNNER_RESTORED_CUT_CONTENT
+			// original code used no voice here
 			Sound_Play_Speech_Line(kActorMoraji, 9020, 50, 0, 50); // Use Moraji's death SPCHSFX, also lower volume
-#endif // BLADERUNNER_ORIGINAL_BUGS
+#endif // BLADERUNNER_RESTORED_CUT_CONTENT
 		}
 		_animationFrame = -1;
 		_animationState = 13;
diff --git a/engines/bladerunner/script/ai/zuben.cpp b/engines/bladerunner/script/ai/zuben.cpp
index 8b85126..a24a0b6 100644
--- a/engines/bladerunner/script/ai/zuben.cpp
+++ b/engines/bladerunner/script/ai/zuben.cpp
@@ -1162,11 +1162,10 @@ bool AIScriptZuben::ChangeAnimationMode(int mode) {
 		break;
 	case kAnimationModeDie:
 		Actor_Set_Targetable(kActorZuben, false);
-#if BLADERUNNER_ORIGINAL_BUGS
-			// original code uses no voice here
-#else
+#if BLADERUNNER_RESTORED_CUT_CONTENT
+		// original code used no voice here
 		Sound_Play_Speech_Line(kActorZuben, 9020, 75, 0, 99); // add Zuben's death rattle here
-#endif // BLADERUNNER_ORIGINAL_BUGS
+#endif // BLADERUNNER_RESTORED_CUT_CONTENT
 		switch (_animationState) {
 			case 2:
 			case 4:
diff --git a/engines/bladerunner/script/scene/ps04.cpp b/engines/bladerunner/script/scene/ps04.cpp
index 51fbbf6..466978c 100644
--- a/engines/bladerunner/script/scene/ps04.cpp
+++ b/engines/bladerunner/script/scene/ps04.cpp
@@ -176,21 +176,13 @@ void SceneScriptPS04::dialogueWithGuzza() {
 
 	case 120: // MONEY
 		Actor_Says(kActorMcCoy, 4000, 18);
-#if BLADERUNNER_ORIGINAL_BUGS
-		Actor_Clue_Acquire(kActorMcCoy, kClueGuzzasCash, true, kActorGuzza);
-		Actor_Says(kActorGuzza, 520, 33);
-		Actor_Says(kActorMcCoy, 4055, 13);
-		Actor_Says(kActorGuzza, 530, 31);
-		Actor_Says(kActorMcCoy, 4060, 13);
-		Actor_Says(kActorGuzza, 540, 31);
-		Actor_Says(kActorGuzza, 550, 32);
-		Actor_Says(kActorMcCoy, 4065, 18);
-		Actor_Says(kActorGuzza, 560, 34);
-		if (Query_Difficulty_Level() != 0) {
-			Global_Variable_Increment(kVariableChinyen, 100);
-		}
-#else
-		if (Global_Variable_Query(kVariableChinyen) < 300) { // basically if McCoy hasn't retired Zuben or drunk away his money at the bar
+#if BLADERUNNER_RESTORED_CUT_CONTENT
+		// Using cut content we have two cases:
+		// 1. Guzza can accept the loan (as in ORIGINAL)
+		// 2. Guzza can refuse the loan (CUT)
+		// Basically, if McCoy hasn't retired Zuben or if he drunk away his money at the bar
+		// then he'll have a small amount of chinyen and Guzza should accept the loan
+		if (Global_Variable_Query(kVariableChinyen) <= 100) {
 			Actor_Clue_Acquire(kActorMcCoy, kClueGuzzasCash, true, kActorGuzza);
 			Actor_Says(kActorGuzza, 520, 33);
 			Actor_Says(kActorMcCoy, 4055, 13);
@@ -203,16 +195,30 @@ void SceneScriptPS04::dialogueWithGuzza() {
 			if (Query_Difficulty_Level() != 0) {
 				Global_Variable_Increment(kVariableChinyen, 100);
 			}
-		} else {	// Guzza denies the loan
+		} else {
+			// McCoy has plenty cash already - Guzza denies the loan
 			Actor_Says(kActorGuzza, 470, 33);	// Hey, I'd love to be your own personal ATM but the department's strapped right now.
 			Actor_Says(kActorGuzza, 480, 31);
 			Actor_Says(kActorGuzza, 490, 31);
 			Actor_Says(kActorGuzza, 500, 32);
 			Actor_Says(kActorMcCoy, 4045, 16);
-			Actor_Says(kActorGuzza, 510, 31);
+			Actor_Says(kActorGuzza, 510, 31);	// Hey, you track down a Rep, you get an advance.
 			Actor_Says(kActorMcCoy, 4050, 18);
 		}
-#endif // BLADERUNNER_ORIGINAL_BUGS
+#else
+		Actor_Clue_Acquire(kActorMcCoy, kClueGuzzasCash, true, kActorGuzza);
+		Actor_Says(kActorGuzza, 520, 33);
+		Actor_Says(kActorMcCoy, 4055, 13);
+		Actor_Says(kActorGuzza, 530, 31);
+		Actor_Says(kActorMcCoy, 4060, 13);
+		Actor_Says(kActorGuzza, 540, 31);
+		Actor_Says(kActorGuzza, 550, 32);
+		Actor_Says(kActorMcCoy, 4065, 18);
+		Actor_Says(kActorGuzza, 560, 34);
+		if (Query_Difficulty_Level() != 0) {
+			Global_Variable_Increment(kVariableChinyen, 100);
+		}
+#endif // BLADERUNNER_RESTORED_CUT_CONTENT
 		break;
 
 	case 130: // REPORT IN