From 8e6386aac0e904776e55ee24cce7b8e3bd1c121d Mon Sep 17 00:00:00 2001 From: NoFantasy Date: Fri, 31 Jul 2009 12:53:51 +0200 Subject: [PATCH] [8282] Correct typo in SetStoppedByPlayer() and it's related. Signed-off-by: NoFantasy --- src/game/WaypointMovementGenerator.cpp | 8 ++++---- src/game/WaypointMovementGenerator.h | 10 +++++----- src/shared/revision_nr.h | 2 +- 3 files changed, 10 insertions(+), 10 deletions(-) diff --git a/src/game/WaypointMovementGenerator.cpp b/src/game/WaypointMovementGenerator.cpp index 874fadf79..903ced7ca 100644 --- a/src/game/WaypointMovementGenerator.cpp +++ b/src/game/WaypointMovementGenerator.cpp @@ -106,7 +106,7 @@ bool WaypointMovementGenerator::Update(Creature &creature, const uint3 { if( i_nextMoveTime.Passed()) // Timer has elapsed, meaning this part controlled it { - SetStopedByPlayer(false); + SetStoppedByPlayer(false); // Now we re-set destination to same node and start travel creature.addUnitState(UNIT_STAT_ROAMING); if (creature.canFly()) @@ -117,11 +117,11 @@ bool WaypointMovementGenerator::Update(Creature &creature, const uint3 } else // if( !i_nextMoveTime.Passed()) { // unexpected end of timer && creature stopped && not at end of segment - if (!IsStopedByPlayer()) + if (!IsStoppedByPlayer()) { // Put 30 seconds delay i_destinationHolder.IncreaseTravelTime(STOP_TIME_FOR_PLAYER); i_nextMoveTime.Reset(STOP_TIME_FOR_PLAYER); - SetStopedByPlayer(true); // Mark we did it + SetStoppedByPlayer(true); // Mark we did it } } return true; // Abort here this update @@ -194,7 +194,7 @@ bool WaypointMovementGenerator::Update(Creature &creature, const uint3 else // If not stopped then stop it and set the reset of TimeTracker to waittime { creature.StopMoving(); - SetStopedByPlayer(false); + SetStoppedByPlayer(false); i_nextMoveTime.Reset(i_path->at(i_currentNode).delay); ++i_currentNode; if( i_currentNode >= i_path->size() ) diff --git a/src/game/WaypointMovementGenerator.h b/src/game/WaypointMovementGenerator.h index 2ee893fb4..c4e34e45e 100644 --- a/src/game/WaypointMovementGenerator.h +++ b/src/game/WaypointMovementGenerator.h @@ -74,7 +74,7 @@ class MANGOS_DLL_SPEC WaypointMovementGenerator public PathMovementBase { public: - WaypointMovementGenerator(Creature &) : i_nextMoveTime(0), b_StopedByPlayer(false) {} + WaypointMovementGenerator(Creature &) : i_nextMoveTime(0), b_StoppedByPlayer(false) {} ~WaypointMovementGenerator() { ClearWaypoints(); } void Initialize(Creature &u) { @@ -86,7 +86,7 @@ public PathMovementBase void Reset(Creature &u) { ReloadPath(u); - b_StopedByPlayer = false; + b_StoppedByPlayer = false; i_nextMoveTime.Reset(0); } bool Update(Creature &u, const uint32 &diff); @@ -100,8 +100,8 @@ public PathMovementBase void ReloadPath(Creature &c) { ClearWaypoints(); LoadPath(c); } // Player stoping creature - bool IsStopedByPlayer() { return b_StopedByPlayer; } - void SetStopedByPlayer(bool val) { b_StopedByPlayer = val; } + bool IsStoppedByPlayer() { return b_StoppedByPlayer; } + void SetStoppedByPlayer(bool val) { b_StoppedByPlayer = val; } // statics static void Initialize(void); @@ -114,7 +114,7 @@ public PathMovementBase TimeTrackerSmall i_nextMoveTime; std::vector i_hasDone; - bool b_StopedByPlayer; + bool b_StoppedByPlayer; }; /** FlightPathMovementGenerator generates movement of the player for the paths diff --git a/src/shared/revision_nr.h b/src/shared/revision_nr.h index bae72737e..19b6a4d8d 100644 --- a/src/shared/revision_nr.h +++ b/src/shared/revision_nr.h @@ -1,4 +1,4 @@ #ifndef __REVISION_NR_H__ #define __REVISION_NR_H__ - #define REVISION_NR "8281" + #define REVISION_NR "8282" #endif // __REVISION_NR_H__