diff options
Diffstat (limited to 'src')
-rw-r--r-- | src/game/WaypointMovementGenerator.cpp | 36 | ||||
-rw-r--r-- | src/trinitycore/trinitycore.conf.dist | 4 |
2 files changed, 20 insertions, 20 deletions
diff --git a/src/game/WaypointMovementGenerator.cpp b/src/game/WaypointMovementGenerator.cpp index 57dacea61e3..8786d25549e 100644 --- a/src/game/WaypointMovementGenerator.cpp +++ b/src/game/WaypointMovementGenerator.cpp @@ -33,24 +33,6 @@ WaypointMovementGenerator<T>::Initialize(T &u){} template<> void -WaypointMovementGenerator<Creature>::Initialize(Creature &u) -{ - u.StopMoving(); - if(!path_id) - path_id = u.GetWaypointPath(); - waypoints = WaypointMgr.GetPath(path_id); - if(waypoints && waypoints->size()) - { - Traveller<Creature> traveller(u); - node = *(waypoints->at(i_currentNode)); - InitTraveller(u,node); - i_destinationHolder.SetDestination(traveller, node.x, node.y, node.z); - i_nextMoveTime.Reset(i_destinationHolder.GetTotalTravelTime()); - } -} - -template<> -void WaypointMovementGenerator<Creature>::Finalize(Creature &u){} template<> @@ -109,6 +91,24 @@ void WaypointMovementGenerator<Creature>::InitTraveller(Creature &unit, const Wa } template<> +void +WaypointMovementGenerator<Creature>::Initialize(Creature &u) +{ + u.StopMoving(); + if(!path_id) + path_id = u.GetWaypointPath(); + waypoints = WaypointMgr.GetPath(path_id); + if(waypoints && waypoints->size()) + { + Traveller<Creature> traveller(u); + node = *(waypoints->at(i_currentNode)); + InitTraveller(u,node); + i_destinationHolder.SetDestination(traveller, node.x, node.y, node.z); + i_nextMoveTime.Reset(i_destinationHolder.GetTotalTravelTime()); + } +} + +template<> void WaypointMovementGenerator<Player>::InitTraveller(Player &unit, const WaypointData &node){} template<class T> diff --git a/src/trinitycore/trinitycore.conf.dist b/src/trinitycore/trinitycore.conf.dist index f4ea9c3a4cd..de93143c6ad 100644 --- a/src/trinitycore/trinitycore.conf.dist +++ b/src/trinitycore/trinitycore.conf.dist @@ -900,7 +900,7 @@ GM.StartLevel = 70 # Visibility.Distance.Grey.Unit # Visibility grey distance for creatures/players (fast changing objects) # addition to appropriate object type Visibility.Distance.* use in case visibility removing to -# object (except corpse around distences) If � is distance and G is grey distance then object +# object (except corpse around distences) If D is distance and G is grey distance then object # make visible if distance to it <= D but make non visible if distance > D+G # Default: 1 (yard) # @@ -1270,4 +1270,4 @@ PvPToken.MapAllowType = 4 PvPToken.ItemID = 29434 PvPToken.ItemCount = 1 NoResetTalentsCost = 0 -ShowKickInWorld = 0
\ No newline at end of file +ShowKickInWorld = 0 |