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

[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:
ada6947918 BLADERUNNER: Fix Zuben not flinching when shot at


Commit: ada69479186db2714cdb6e170328350e0a3c8176
    https://github.com/scummvm/scummvm/commit/ada69479186db2714cdb6e170328350e0a3c8176
Author: Thanasis Antoniou (a.antoniou79 at gmail.com)
Date: 2019-03-04T12:14:29+02:00

Commit Message:
BLADERUNNER: Fix Zuben not flinching when shot at

Changed paths:
    engines/bladerunner/actor.cpp


diff --git a/engines/bladerunner/actor.cpp b/engines/bladerunner/actor.cpp
index b884fe7..34345c9 100644
--- a/engines/bladerunner/actor.cpp
+++ b/engines/bladerunner/actor.cpp
@@ -59,9 +59,6 @@ Actor::Actor(BladeRunnerEngine *vm, int actorId) {
 
 	_friendlinessToOther.resize(_vm->_gameInfo->getActorCount());
 
-	_mustReachWalkDestination = false;
-	_damageAnimIfMoving       = false;
-
 	setup(actorId);
 }
 
@@ -86,6 +83,7 @@ void Actor::setup(int actorId) {
 	_fps            = 15;
 	_frameMs       = 1000 / _fps;
 
+	_mustReachWalkDestination = false;	// Original's _inWalkLoop. Moved here from our constructor, since it's here in the original's init()
 	_isMoving            = false;
 	_isTarget            = false;
 	_inCombat            = false;
@@ -117,6 +115,9 @@ void Actor::setup(int actorId) {
 
 	_currentHP  = 50;
 	_maxHP      = 50;
+
+	_damageAnimIfMoving       = true;	// Set to true (like in original). And moved here from our constructor, since it's here in the original's init().
+
 	_goalNumber = -1;
 
 	_movementTrackPaused         = false;