pa/eqemu-server
2
0
Fork 0
mirror of https://github.com/EQEmu/Server.git synced 2026-03-10 01:52:25 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fix for swapped x and y returns on failure case for FindRoute

Browse Source
This commit is contained in:
KimLS 2016-01-14 21:55:08 -08:00
parent 9c3e957d4e
commit 14d8683227
1 changed files with 3 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
common/pathfind.cpp
View File

@ -152,15 +152,9 @@ PathfindingRoute PathfindingManager::FindRoute(const glm::vec3 &src_loc, const g
ret.m_active = true; ret.m_active = true;
if (!m_nav_mesh) { if (!m_nav_mesh) {
PathfindingNode src;
src.flag = NavigationPolyFlagNormal;
src.position = current_location;
PathfindingNode dest; PathfindingNode dest;
dest.flag = NavigationPolyFlagNormal; dest.flag = NavigationPolyFlagNormal;
dest.position = dest_location; dest.position = dest_loc;
ret.m_nodes.push_back(src);
ret.m_nodes.push_back(dest); ret.m_nodes.push_back(dest);
return ret; return ret;
} }
@ -178,15 +172,9 @@ PathfindingRoute PathfindingManager::FindRoute(const glm::vec3 &src_loc, const g
m_nav_query->findNearestPoly(&dest_location[0], &ext[0], &m_filter, &end_ref, 0); m_nav_query->findNearestPoly(&dest_location[0], &ext[0], &m_filter, &end_ref, 0);
if (!start_ref || !end_ref) { if (!start_ref || !end_ref) {
PathfindingNode src;
src.flag = NavigationPolyFlagNormal;
src.position = current_location;
PathfindingNode dest; PathfindingNode dest;
dest.flag = NavigationPolyFlagNormal; dest.flag = NavigationPolyFlagNormal;
dest.position = dest_location; dest.position = dest_loc;
ret.m_nodes.push_back(src);
ret.m_nodes.push_back(dest); ret.m_nodes.push_back(dest);
return ret; return ret;
} }
@ -225,15 +213,9 @@ PathfindingRoute PathfindingManager::FindRoute(const glm::vec3 &src_loc, const g
} }
} }
else { else {
PathfindingNode src;
src.flag = NavigationPolyFlagNormal;
src.position = current_location;
PathfindingNode dest; PathfindingNode dest;
dest.flag = NavigationPolyFlagNormal; dest.flag = NavigationPolyFlagNormal;
dest.position = dest_location; dest.position = dest_loc;
ret.m_nodes.push_back(src);
ret.m_nodes.push_back(dest); ret.m_nodes.push_back(dest);
} }