diff options
| author | Thomas Fach-Pedersen | 2018-01-29 21:48:48 +0100 |
|---|---|---|
| committer | Thomas Fach-Pedersen | 2018-01-29 21:52:17 +0100 |
| commit | 270b691b27c807b841483ebf2bb00b2f47a15758 (patch) | |
| tree | c789c6d7280dc237fbd2ff80dd18d9d88a6e2c59 /engines/bladerunner/actor.h | |
| parent | a4229c93989843c17fcdef4363cdd9302f828725 (diff) | |
| download | scummvm-rg350-270b691b27c807b841483ebf2bb00b2f47a15758.tar.gz scummvm-rg350-270b691b27c807b841483ebf2bb00b2f47a15758.tar.bz2 scummvm-rg350-270b691b27c807b841483ebf2bb00b2f47a15758.zip | |
BLADERUNNER: Remove simple walking hack
Rename previously unnamed walking parameter 'interruptible'
Diffstat (limited to 'engines/bladerunner/actor.h')
| -rw-r--r-- | engines/bladerunner/actor.h | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/engines/bladerunner/actor.h b/engines/bladerunner/actor.h index 5068143776..4fd513103a 100644 --- a/engines/bladerunner/actor.h +++ b/engines/bladerunner/actor.h @@ -143,11 +143,11 @@ public: void movementTrackUnpause(); void movementTrackWaypointReached(); - bool loopWalkToActor(int otherActorId, int destinationOffset, int a3, bool run, bool a5, bool *flagIsRunning); - bool loopWalkToItem(int itemId, int destinationOffset, int a3, bool run, bool a5, bool *flagIsRunning); - bool loopWalkToSceneObject(const char *objectName, int destinationOffset, bool a3, bool run, bool a5, bool *flagIsRunning); - bool loopWalkToWaypoint(int waypointId, int destinationOffset, int a3, bool run, bool a5, bool *flagIsRunning); - bool loopWalkToXYZ(const Vector3 &destination, int destinationOffset, bool a3, bool run, bool a5, bool *flagIsRunning); + bool loopWalkToActor(int otherActorId, int destinationOffset, int interruptible, bool run, bool a5, bool *flagIsRunning); + bool loopWalkToItem(int itemId, int destinationOffset, int interruptible, bool run, bool a5, bool *flagIsRunning); + bool loopWalkToSceneObject(const char *objectName, int destinationOffset, bool interruptible, bool run, bool a5, bool *flagIsRunning); + bool loopWalkToWaypoint(int waypointId, int destinationOffset, int interruptible, bool run, bool a5, bool *flagIsRunning); + bool loopWalkToXYZ(const Vector3 &destination, int destinationOffset, bool interruptible, bool run, bool a5, bool *flagIsRunning); bool asyncWalkToWaypoint(int waypointId, int destinationOffset, bool run, bool a5); void asyncWalkToXYZ(const Vector3 &destination, int destinationOffset, bool run, int a6); @@ -223,8 +223,8 @@ private: void setFacing(int facing, bool halfOrSet = true); void setBoundingBox(const Vector3 &position, bool retired); float distanceFromView(View *view) const; - - bool loopWalk(const Vector3 &destination, int destinationOffset, bool a3, bool run, const Vector3 &start, float a6, float a7, bool a8, bool *isRunning, bool async); + + bool loopWalk(const Vector3 &destination, int destinationOffset, bool interruptible, bool run, const Vector3 &start, float a6, float a7, bool a8, bool *isRunning, bool async); bool walkTo(bool run, const Vector3 &destination, bool a3); bool walkFindU1(const Vector3 &startPosition, const Vector3 &targetPosition, float a3, Vector3 *newDestination); |