Fix some constants.

This commit is contained in:
Paul Coene 2017-09-17 12:11:02 -04:00
parent e3972cc9e6
commit 59152a9d77
4 changed files with 7 additions and 7 deletions

View File

@ -7257,7 +7257,7 @@ void command_bestz(Client *c, const Seperator *sep) {
float best_z = zone->zonemap->FindBestZ(me, &hit); float best_z = zone->zonemap->FindBestZ(me, &hit);
if (best_z != -999999) if (best_z != BEST_Z_INVALID)
{ {
c->Message(0, "Z is %.3f at (%.3f, %.3f).", best_z, me.x, me.y); c->Message(0, "Z is %.3f at (%.3f, %.3f).", best_z, me.x, me.y);
} }

View File

@ -163,7 +163,7 @@ void Mob::CalculateNewFearpoint()
ranx = GetX()+zone->random.Int(0, ran-1)-zone->random.Int(0, ran-1); ranx = GetX()+zone->random.Int(0, ran-1)-zone->random.Int(0, ran-1);
rany = GetY()+zone->random.Int(0, ran-1)-zone->random.Int(0, ran-1); rany = GetY()+zone->random.Int(0, ran-1)-zone->random.Int(0, ran-1);
ranz = FindGroundZ(ranx,rany); ranz = FindGroundZ(ranx,rany);
if (ranz == -999999) if (ranz == BEST_Z_INVALID)
continue; continue;
float fdist = ranz - GetZ(); float fdist = ranz - GetZ();
if (fdist >= -12 && fdist <= 12 && CheckCoordLosNoZLeaps(GetX(),GetY(),GetZ(),ranx,rany,ranz)) if (fdist >= -12 && fdist <= 12 && CheckCoordLosNoZLeaps(GetX(),GetY(),GetZ(),ranx,rany,ranz))

View File

@ -3441,7 +3441,7 @@ void Mob::SetTarget(Mob* mob) {
float Mob::FindGroundZ(float new_x, float new_y, float z_offset) float Mob::FindGroundZ(float new_x, float new_y, float z_offset)
{ {
float ret = -999999; float ret = BEST_Z_INVALID;
if (zone->zonemap != nullptr) if (zone->zonemap != nullptr)
{ {
glm::vec3 me; glm::vec3 me;
@ -3450,7 +3450,7 @@ float Mob::FindGroundZ(float new_x, float new_y, float z_offset)
me.z = m_Position.z + z_offset; me.z = m_Position.z + z_offset;
glm::vec3 hit; glm::vec3 hit;
float best_z = zone->zonemap->FindBestZ(me, &hit); float best_z = zone->zonemap->FindBestZ(me, &hit);
if (best_z != -999999) if (best_z != BEST_Z_INVALID)
{ {
ret = best_z; ret = best_z;
} }
@ -3461,7 +3461,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 // 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 Mob::GetGroundZ(float new_x, float new_y, float z_offset)
{ {
float ret = -999999; float ret = BEST_Z_INVALID;
if (zone->zonemap != 0) if (zone->zonemap != 0)
{ {
glm::vec3 me; glm::vec3 me;
@ -3470,7 +3470,7 @@ float Mob::GetGroundZ(float new_x, float new_y, float z_offset)
me.z = m_Position.z+z_offset; me.z = m_Position.z+z_offset;
glm::vec3 hit; glm::vec3 hit;
float best_z = zone->zonemap->FindBestZ(me, &hit); float best_z = zone->zonemap->FindBestZ(me, &hit);
if (best_z != -999999) if (best_z != BEST_Z_INVALID)
{ {
ret = best_z; ret = best_z;
} }

View File

@ -867,7 +867,7 @@ void Mob::FixZ(int32 z_find_offset /*= 5*/)
duration duration
); );
if ((new_z > -2000) && new_z != -999999) { if ((new_z > -2000) && new_z != BEST_Z_INVALID) {
if (RuleB(Map, MobZVisualDebug)) if (RuleB(Map, MobZVisualDebug))
this->SendAppearanceEffect(78, 0, 0, 0, 0); this->SendAppearanceEffect(78, 0, 0, 0, 0);