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

[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:
e263207ba1 BLADERUNNER: Restore bits of Guzza dialogue


Commit: e263207ba1a083eb69c08a77da32e5bc06db77de
    https://github.com/scummvm/scummvm/commit/e263207ba1a083eb69c08a77da32e5bc06db77de
Author: antoniou79 (a.antoniou79 at gmail.com)
Date: 2019-08-18T13:32:39+03:00

Commit Message:
BLADERUNNER: Restore bits of Guzza dialogue

Changed paths:
    engines/bladerunner/script/ai/mccoy.cpp
    engines/bladerunner/script/scene/ps04.cpp
    engines/bladerunner/script/scene/ps05.cpp


diff --git a/engines/bladerunner/script/ai/mccoy.cpp b/engines/bladerunner/script/ai/mccoy.cpp
index e39d0f8..5ede8c6 100644
--- a/engines/bladerunner/script/ai/mccoy.cpp
+++ b/engines/bladerunner/script/ai/mccoy.cpp
@@ -459,34 +459,39 @@ bool AIScriptMcCoy::GoalChanged(int currentGoalNumber, int newGoalNumber) {
 		Sound_Play(kSfxVIDFONE1, 30, 0, 0, 50);
 		Delay(1000);
 		Sound_Play(kSfxSPNBEEP9, 50, 0, 0, 50);
-		Actor_Says(kActorGuzza, 1380, 3);
+		Actor_Says(kActorGuzza, 1380, kAnimationModeTalk);
 		Actor_Says(kActorMcCoy, 6610, 13);
-		Actor_Says(kActorGuzza, 1390, 3);
+		Actor_Says(kActorGuzza, 1390, kAnimationModeTalk);
 		Actor_Says(kActorMcCoy, 6615, 18);
-		Actor_Says(kActorGuzza, 1420, 3);
+		if (_vm->_cutContent) {
+			Actor_Says(kActorGuzza, 1400, kAnimationModeTalk);
+			Actor_Says(kActorGuzza, 1410, kAnimationModeTalk);
+			Actor_Says(kActorMcCoy, 6620, 15);
+		}
+		Actor_Says(kActorGuzza, 1420, kAnimationModeTalk);
 		Actor_Says(kActorMcCoy, 6625, 11);
-		Actor_Says(kActorGuzza, 1430, 3);
+		Actor_Says(kActorGuzza, 1430, kAnimationModeTalk);
 		Actor_Says(kActorMcCoy, 6630, 12);
 		Actor_Says(kActorMcCoy, 6635, 17);
 		Actor_Says(kActorMcCoy, 6640, 13);
 		Actor_Says(kActorMcCoy, 6645, 19);
 		Actor_Says(kActorMcCoy, 6650, 18);
 		Actor_Says(kActorMcCoy, 6655, 11);
-		Actor_Says(kActorGuzza, 1440, 3);
+		Actor_Says(kActorGuzza, 1440, kAnimationModeTalk);
 		Actor_Says(kActorMcCoy, 6660, 17);
 		Actor_Says(kActorMcCoy, 6665, 13);
 		Delay(1000);
-		Actor_Says(kActorGuzza, 1450, 3);
+		Actor_Says(kActorGuzza, 1450, kAnimationModeTalk);
 		Actor_Says(kActorMcCoy, 6670, 14);
 		Actor_Says(kActorMcCoy, 6675, 11);
-		Actor_Says(kActorGuzza, 1460, 3);
+		Actor_Says(kActorGuzza, 1460, kAnimationModeTalk);
 		Actor_Says(kActorMcCoy, 6680, 12);
-		Actor_Says(kActorGuzza, 1470, 3);
+		Actor_Says(kActorGuzza, 1470, kAnimationModeTalk);
 		Actor_Says(kActorMcCoy, 6685, 13);
 		Delay(500);
 		Actor_Says(kActorMcCoy, 6695, 16);
 		Actor_Says(kActorMcCoy, 6700, 17);
-		Actor_Says(kActorGuzza, 1480, 3);
+		Actor_Says(kActorGuzza, 1480, kAnimationModeTalk);
 		Actor_Says(kActorMcCoy, 6705, 11);
 		Sound_Play(kSfxSPNBEEP9, 50, 0, 0, 50);
 		return true;
diff --git a/engines/bladerunner/script/scene/ps04.cpp b/engines/bladerunner/script/scene/ps04.cpp
index e114ecb..2d679d9 100644
--- a/engines/bladerunner/script/scene/ps04.cpp
+++ b/engines/bladerunner/script/scene/ps04.cpp
@@ -178,8 +178,16 @@ void SceneScriptPS04::dialogueWithGuzza() {
 
 	switch (answer) {
 	case 110: // REQUEST TYRELL MEETING
+		if (_vm->_cutContent) {
+			Actor_Says(kActorGuzza, 420, 31);
+		}
 		Actor_Says(kActorMcCoy, 3990, 19);
 		Actor_Says(kActorMcCoy, 3995, 17);
+		if (_vm->_cutContent) {
+			Actor_Says(kActorGuzza, 430, 33);
+			Actor_Says(kActorMcCoy, 4025, 18);
+			Actor_Says(kActorMcCoy, 4030, 12);
+		}
 		Actor_Says(kActorGuzza, 440, 31);
 		Actor_Says(kActorMcCoy, 4035, 13);
 		Actor_Says(kActorGuzza, 450, 34);
diff --git a/engines/bladerunner/script/scene/ps05.cpp b/engines/bladerunner/script/scene/ps05.cpp
index 8bb579c..fb5c30b 100644
--- a/engines/bladerunner/script/scene/ps05.cpp
+++ b/engines/bladerunner/script/scene/ps05.cpp
@@ -242,9 +242,13 @@ void SceneScriptPS05::turnOnTV() {
 				ADQ_Add(kActorNewscaster, 130, kAnimationModeTalk);
 				ADQ_Add(kActorNewscaster, 140, kAnimationModeTalk);
 				ADQ_Add(kActorNewscaster, 150, kAnimationModeTalk);
-				ADQ_Add(kActorGuzza, 1570, kAnimationModeTalk);
-				ADQ_Add(kActorGuzza, 1580, kAnimationModeTalk);
-				ADQ_Add(kActorGuzza, 1590, kAnimationModeTalk);
+				if (_vm->_cutContent && Random_Query(1, 3) == 1) {
+					ADQ_Add(kActorGuzza, 1600, kAnimationModeTalk);
+				} else {
+					ADQ_Add(kActorGuzza, 1570, kAnimationModeTalk);
+					ADQ_Add(kActorGuzza, 1580, kAnimationModeTalk);
+					ADQ_Add(kActorGuzza, 1590, kAnimationModeTalk);
+				}
 			} else {
 				ADQ_Add(kActorNewscaster, 90, kAnimationModeTalk);
 				ADQ_Add(kActorNewscaster, 100, kAnimationModeTalk);