From 52476b0778d4e02a67b61793b9ebeb1725658b40 Mon Sep 17 00:00:00 2001
From: Peter Kohaut
Date: Thu, 23 Mar 2017 00:25:38 +0100
Subject: BLADERUNNER: Added more functionality to movement track

---
 engines/bladerunner/actor.h | 28 +++++++++++++++++++++-------
 1 file changed, 21 insertions(+), 7 deletions(-)

(limited to 'engines/bladerunner/actor.h')

diff --git a/engines/bladerunner/actor.h b/engines/bladerunner/actor.h
index a14139cf3d..d924730b4b 100644
--- a/engines/bladerunner/actor.h
+++ b/engines/bladerunner/actor.h
@@ -78,6 +78,16 @@ private:
 	bool _isMoving;
 	bool _damageAnimIfMoving;
 
+	// Movement
+	bool _movementTrackPaused;
+	int _movementTrackNextWaypointId;
+	int _movementTrackNextDelay; // probably not used
+	int _movementTrackNextAngle; // probably not used
+	bool _movementTrackNextRunning;
+
+	int _movementTrackWalkingToWaypointId;
+	int _movementTrackDelayOnNextWaypoint;
+
 	// Animation
 	int _width;
 	int _height;
@@ -122,7 +132,16 @@ public:
 	void changeAnimationMode(int animationMode, bool force = false);
 	void setFPS(int fps);
 
-	void processMovement();
+	void countdownTimerStart(int timerId, int interval);
+	void countdownTimerReset(int timerId);
+	int  countdownTimerGetRemainingTime(int timerId);
+	void countdownTimersUpdate();
+	void countdownTimerUpdate(int timerId);
+
+	void movementTrackNext(bool omitAiScript);
+	void movementTrackPause();
+	void movementTrackUnpause();
+	void movementTrackWaypointReached();
 
 	bool loopWalkToActor(int otherActorId, int destinationOffset, int a3, bool run, bool a5, bool *isRunning);
 	bool loopWalkToItem(int itemId, int destinationOffset, int a3, bool run, bool a5, bool *isRunning);
@@ -133,12 +152,6 @@ public:
 	bool tick(bool forceUpdate);
 	void draw();
 
-	void countdownTimerStart(int timerId, int interval);
-	void countdownTimerReset(int timerId);
-	int  countdownTimerGetRemainingTime(int timerId);
-	void countdownTimersUpdate();
-	void countdownTimerUpdate(int timerId);
-
 	int getSetId();
 	void setSetId(int setId);
 	BoundingBox *getBoundingBox() { return _bbox; }
@@ -152,6 +165,7 @@ public:
 	bool isMoving() { return _isMoving; }
 	void setMoving(bool value) { _isMoving = value; }
 	bool isWalking();
+	bool isRunning();
 	void stopWalking(bool value);
 
 	void faceActor(int otherActorId, bool animate);
-- 
cgit v1.2.3