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

[peterkohaut]

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:
d8ba527cf0 BLADERUNNER: Fix Moraji floating in DR04


Commit: d8ba527cf0c2613bdcdd5869ecc70e626888b82e
    https://github.com/scummvm/scummvm/commit/d8ba527cf0c2613bdcdd5869ecc70e626888b82e
Author: Peter Kohaut (peter.kohaut at gmail.com)
Date: 2019-05-05T22:16:28+02:00

Commit Message:
BLADERUNNER: Fix Moraji floating in DR04

Changed paths:
    engines/bladerunner/actor.cpp
    engines/bladerunner/script/ai/moraji.cpp


diff --git a/engines/bladerunner/actor.cpp b/engines/bladerunner/actor.cpp
index f0153f8..a686722 100644
--- a/engines/bladerunner/actor.cpp
+++ b/engines/bladerunner/actor.cpp
@@ -723,6 +723,14 @@ void Actor::tickCombat() {
 
 bool Actor::draw(Common::Rect *screenRect) {
 	Vector3 drawPosition(_position.x, -_position.z, _position.y + 2.0);
+
+#if !BLADERUNNER_ORIGINAL_BUGS
+	// In the original game, Moraji appears to be floating above the ground a bit
+	if (_id == kActorMoraji && _setId == kSetDR01_DR02_DR04) {
+		drawPosition.z -= 6.0f;
+	}
+#endif
+
 	float drawAngle = M_PI - _facing * (M_PI / 512.0f);
 	float drawScale = _scale;
 
diff --git a/engines/bladerunner/script/ai/moraji.cpp b/engines/bladerunner/script/ai/moraji.cpp
index ade5e22..7d5fe1d 100644
--- a/engines/bladerunner/script/ai/moraji.cpp
+++ b/engines/bladerunner/script/ai/moraji.cpp
@@ -189,7 +189,7 @@ bool AIScriptMoraji::GoalChanged(int currentGoalNumber, int newGoalNumber) {
 		return true;
 
 	case kGoalMorajiDie:
-		// Added check here  to have Moraji death speech SFX
+		// Added check here to have Moraji death speech SFX
 		// when shot by McCoy outside the Dermo Design Lab
 		if (_vm->_cutContent && Game_Flag_Query(kFlagDR04McCoyShotMoraji)) {
 			// original code used no voice here