pa/eqemu-server
2
0
Fork 0
mirror of https://github.com/EQEmu/Server.git synced 2026-05-19 13:28:25 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge fix

Browse Source
This commit is contained in:
KimLS
2017-09-17 13:20:48 -07:00
parent 9dd4002337 0cf5a7aec3
commit fc7623b690
17 changed files with 140 additions and 74 deletions
Download Patch File Download Diff File Expand all files Collapse all files
zone/mob.cpp
+4 -4
View File
@@ -3439,7 +3439,7 @@ void Mob::SetTarget(Mob* mob) {
float Mob::FindGroundZ(float new_x, float new_y, float z_offset)
{
float ret = -999999;
float ret = BEST_Z_INVALID;
if (zone->zonemap != nullptr)
{
glm::vec3 me;
@@ -3448,7 +3448,7 @@ float Mob::FindGroundZ(float new_x, float new_y, float z_offset)
me.z = m_Position.z + z_offset;
glm::vec3 hit;
float best_z = zone->zonemap->FindBestZ(me, &hit);
if (best_z != -999999)
if (best_z != BEST_Z_INVALID)
{
ret = best_z;
}
@@ -3459,7 +3459,7 @@ float Mob::FindGroundZ(float new_x, float new_y, float z_offset)
// Copy of above function that isn't protected to be exported to Perl::Mob
float Mob::GetGroundZ(float new_x, float new_y, float z_offset)
{
float ret = -999999;
float ret = BEST_Z_INVALID;
if (zone->zonemap != 0)
{
glm::vec3 me;
@@ -3468,7 +3468,7 @@ float Mob::GetGroundZ(float new_x, float new_y, float z_offset)
me.z = m_Position.z+z_offset;
glm::vec3 hit;
float best_z = zone->zonemap->FindBestZ(me, &hit);
if (best_z != -999999)
if (best_z != BEST_Z_INVALID)
{
ret = best_z;
}