[Scummvm-git-logs] scummvm master -> 491adeb656a65db03050ad40da44c53131b6ec3e

antoniou79 antoniou at cti.gr
Sun Jul 14 14:54:11 CEST 2019


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:
491adeb656 BLADERUNNER: Fix Rats resurrecting


Commit: 491adeb656a65db03050ad40da44c53131b6ec3e
    https://github.com/scummvm/scummvm/commit/491adeb656a65db03050ad40da44c53131b6ec3e
Author: Thanasis Antoniou (a.antoniou79 at gmail.com)
Date: 2019-07-14T15:53:10+03:00

Commit Message:
BLADERUNNER: Fix Rats resurrecting

Changed paths:
    engines/bladerunner/actor.h
    engines/bladerunner/bladerunner.cpp
    engines/bladerunner/combat.cpp


diff --git a/engines/bladerunner/actor.h b/engines/bladerunner/actor.h
index 9d84e57..5f4884f 100644
--- a/engines/bladerunner/actor.h
+++ b/engines/bladerunner/actor.h
@@ -128,6 +128,7 @@ public:
 	void setAtXYZ(const Vector3 &pos, int facing, bool setFacing = true, bool moving = false, bool retired = false);
 	void setAtWaypoint(int waypointId, int angle, int unknown, bool retired);
 
+	int  getId() const { return _id; };
 	float getX() const;
 	float getY() const;
 	float getZ() const;
diff --git a/engines/bladerunner/bladerunner.cpp b/engines/bladerunner/bladerunner.cpp
index 8c729a7..ecb4048 100644
--- a/engines/bladerunner/bladerunner.cpp
+++ b/engines/bladerunner/bladerunner.cpp
@@ -374,6 +374,7 @@ Common::Error BladeRunnerEngine::run() {
 		//  else {
 		// 	newGame(kGameDifficultyMedium);
 		// }
+
 		gameLoop();
 
 		_mouse->disable();
diff --git a/engines/bladerunner/combat.cpp b/engines/bladerunner/combat.cpp
index afe339c..f62e91d 100644
--- a/engines/bladerunner/combat.cpp
+++ b/engines/bladerunner/combat.cpp
@@ -158,6 +158,11 @@ void Combat::shoot(int actorId, Vector3 &to, int screenX) {
 		if (actor->inCombat()) {
 			actor->combatModeOff();
 		}
+#if BLADERUNNER_ORIGINAL_BUGS
+#else
+		// make sure the dead enemy won't pick a pending movement track and re-spawn
+		actor->_movementTrack->flush();
+#endif
 		actor->stopWalking(false);
 		actor->changeAnimationMode(kAnimationModeDie, false);
 





More information about the Scummvm-git-logs mailing list