From d8ba527cf0c2613bdcdd5869ecc70e626888b82e Mon Sep 17 00:00:00 2001
From: Peter Kohaut
Date: Sun, 5 May 2019 22:16:28 +0200
Subject: BLADERUNNER: Fix Moraji floating in DR04

---
 engines/bladerunner/actor.cpp            | 8 ++++++++
 engines/bladerunner/script/ai/moraji.cpp | 2 +-
 2 files changed, 9 insertions(+), 1 deletion(-)

(limited to 'engines')

diff --git a/engines/bladerunner/actor.cpp b/engines/bladerunner/actor.cpp
index f0153f8618..a686722c8b 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 ade5e22d95..7d5fe1dbeb 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
-- 
cgit v1.2.3