diff --git a/zone/map.cpp b/zone/map.cpp index 487a9de0b..0627c2dc2 100644 --- a/zone/map.cpp +++ b/zone/map.cpp @@ -268,14 +268,6 @@ bool Map::CheckLoS(glm::vec3 myloc, glm::vec3 oloc) const { return !imp->rm->raycast((const RmReal*)&myloc, (const RmReal*)&oloc, nullptr, nullptr, nullptr); } -// returns true if outloc should be used -bool Map::FindClosestLoS(glm::vec3 myloc, glm::vec3 oloc, glm::vec3 &outloc) const { - if(!imp) - return false; - - return imp->rm->raycast((const RmReal*)&myloc, (const RmReal*)&oloc, (RmReal *)&outloc, nullptr, nullptr); -} - // returns true if a collision happens bool Map::DoCollisionCheck(glm::vec3 myloc, glm::vec3 oloc, glm::vec3 &outnorm, float &distance) const { if(!imp) diff --git a/zone/map.h b/zone/map.h index 34638eec1..8a2ec7f68 100644 --- a/zone/map.h +++ b/zone/map.h @@ -42,7 +42,6 @@ public: bool LineIntersectsZone(glm::vec3 start, glm::vec3 end, float step, glm::vec3 *result) const; bool LineIntersectsZoneNoZLeaps(glm::vec3 start, glm::vec3 end, float step_mag, glm::vec3 *result) const; bool CheckLoS(glm::vec3 myloc, glm::vec3 oloc) const; - bool FindClosestLoS(glm::vec3 myloc, glm::vec3 oloc, glm::vec3 &outloc) const; bool DoCollisionCheck(glm::vec3 myloc, glm::vec3 oloc, glm::vec3 &outnorm, float &distance) const; #ifdef USE_MAP_MMFS diff --git a/zone/waypoints.cpp b/zone/waypoints.cpp index 6cf74bb65..55a2cc511 100644 --- a/zone/waypoints.cpp +++ b/zone/waypoints.cpp @@ -1012,7 +1012,7 @@ void Mob::TryMoveAlong(float distance, float angle, bool send) if (new_z != BEST_Z_INVALID) new_pos.z = new_z; - if (zone->zonemap->FindClosestLoS(GetPosition(), new_pos, tmp_pos)) + if (zone->zonemap->LineIntersectsZone(GetPosition(), new_pos, 0.0f, &tmp_pos)) new_pos = tmp_pos; }