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

[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:
dc74061311 BLADERUNNER: Add Zuben's death rattle


Commit: dc74061311e9581d834fae5bbdf9eeb218248068
    https://github.com/scummvm/scummvm/commit/dc74061311e9581d834fae5bbdf9eeb218248068
Author: Thanasis Antoniou (a.antoniou79 at gmail.com)
Date: 2019-03-04T14:22:51+02:00

Commit Message:
BLADERUNNER: Add Zuben's death rattle

Other actors are missing their death rattle's (original bug). Will be fixed at later patch on case by case basis.

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


diff --git a/engines/bladerunner/combat.cpp b/engines/bladerunner/combat.cpp
index 3bc876f..a6677a1 100644
--- a/engines/bladerunner/combat.cpp
+++ b/engines/bladerunner/combat.cpp
@@ -165,7 +165,7 @@ void Combat::shoot(int actorId, Vector3 &to, int screenX) {
 		actor->setAtXYZ(actor->getXYZ(), actor->getFacing(), true, false, true);
 		_vm->_sceneObjects->setRetired(actorId + kSceneObjectOffsetActors, true);
 
-		sentenceId = 9020;
+		sentenceId = 9020; // Bug or intended? This sentence id (death rattle) won't be used in this case since combat mode is set to off above. Probably intended, in order to use the rattle in a case by case (?)
 	}
 
 	if (sentenceId >= 0 && actor->inCombat()) {
diff --git a/engines/bladerunner/script/ai/zuben.cpp b/engines/bladerunner/script/ai/zuben.cpp
index 4428b90..8c96031 100644
--- a/engines/bladerunner/script/ai/zuben.cpp
+++ b/engines/bladerunner/script/ai/zuben.cpp
@@ -1162,6 +1162,7 @@ bool AIScriptZuben::ChangeAnimationMode(int mode) {
 		break;
 	case kAnimationModeDie:
 		Actor_Set_Targetable(kActorZuben, false);
+		Sound_Play_Speech_Line(kActorZuben, 9020, 75, 0, 99); // add Zuben's death rattle here
 		switch (_animationState) {
 			case 2:
 			case 4: