pa/eqemu-server
2
0
Fork 0
mirror of https://github.com/EQEmu/Server.git synced 2026-05-16 22:58:34 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Move update path to movement manager so all movement will use paths

Browse Source
This commit is contained in:
KimLS
2018-09-18 23:06:56 -07:00
parent 2224b83ae0
commit f754cb1307
14 changed files with 66 additions and 236 deletions
Download Patch File Download Diff File Expand all files Collapse all files
zone/merc.cpp
+3 -30
View File
@@ -1478,25 +1478,8 @@ void Merc::AI_Process() {
return;
}
else if (!CheckLosFN(GetTarget())) {
if (RuleB(Mercs, MercsUsePathing) && zone->pathing) {
bool WaypointChanged, NodeReached;
glm::vec3 Goal = UpdatePath(
GetTarget()->GetX(),
GetTarget()->GetY(),
GetTarget()->GetZ(),
GetRunspeed(),
WaypointChanged,
NodeReached
);
CalculateNewPosition(Goal.x, Goal.y, Goal.z, GetRunspeed());
}
else {
Mob* follow = entity_list.GetMob(GetFollowID());
if (follow)
CalculateNewPosition(follow->GetX(), follow->GetY(), follow->GetZ(), GetRunspeed());
}
auto Goal = GetTarget()->GetPosition();
CalculateNewPosition(Goal.x, Goal.y, Goal.z, GetRunspeed());
return;
}
@@ -1775,17 +1758,7 @@ void Merc::AI_Process() {
SetRunAnimSpeed(0);
if (dist > GetFollowDistance()) {
if (RuleB(Mercs, MercsUsePathing) && zone->pathing) {
bool WaypointChanged, NodeReached;
glm::vec3 Goal = UpdatePath(follow->GetX(), follow->GetY(), follow->GetZ(),
speed, WaypointChanged, NodeReached);
CalculateNewPosition(Goal.x, Goal.y, Goal.z, speed);
}
else {
CalculateNewPosition(follow->GetX(), follow->GetY(), follow->GetZ(), speed);
}
CalculateNewPosition(follow->GetX(), follow->GetY(), follow->GetZ(), speed);
if (rest_timer.Enabled())
rest_timer.Disable();