Mirror/TrinityCore
1
0
Fork 0
mirror of https://github.com/TrinityCore/TrinityCore.git synced 2026-01-20 09:17:36 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #11391 from Nawuko/waypoint-fix

Browse Source 
Core/Waypoints: Revert partly f1a82a578b t...
This commit is contained in:
Shauren
2013-12-31 10:43:41 -08:00
parent 0e7805bac9 3209a32fa4
commit fd72065645
2 changed files with 2 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/server/game/Movement/MovementGenerators/WaypointMovementGenerator.cpp
View File

@@ -193,8 +193,7 @@ bool WaypointMovementGenerator<Creature>::DoUpdate(Creature* creature, uint32 di
{
if (creature->IsStopped())
Stop(STOP_TIME_FOR_PLAYER);
// Checking just before reaching waypoint gives smother movement than using FinalDestination
else if (creature->movespline->timeElapsed() < 150)
else if (creature->movespline->Finalized())
{
OnArrived(creature);
return StartMove(creature);

2
src/server/game/Movement/Spline/MoveSpline.h
View File

@@ -79,10 +79,10 @@ namespace Movement
UpdateResult _updateState(int32& ms_time_diff);
int32 next_timestamp() const { return spline.length(point_Idx + 1); }
int32 segment_time_elapsed() const { return next_timestamp() - time_passed; }
int32 timeElapsed() const { return Duration() - time_passed; }
int32 timePassed() const { return time_passed; }
public:
int32 timeElapsed() const { return Duration() - time_passed; }
int32 Duration() const { return spline.length(); }
MySpline const& _Spline() const { return spline; }
int32 _currentSplineIdx() const { return point_Idx; }