pa/eqemu-server
2
0
Fork 0
mirror of https://github.com/EQEmu/Server.git synced 2025-12-14 07:21:48 +00:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Removed safe_x(), safe_y(), safe_z() from Zone

Browse Source
This commit is contained in:
Arthur Ice 2014-12-02 20:17:14 -08:00
parent 0275e9646c
commit e64e131c9c
3 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
zone/client_packet.cpp
View File

@ -1460,9 +1460,10 @@ void Client::Handle_Connect_OP_ZoneEntry(const EQApplicationPacket *app)
strcpy(lastname, m_pp.last_name); strcpy(lastname, m_pp.last_name);
/* If PP is set to weird coordinates */ /* If PP is set to weird coordinates */
if ((m_pp.x == -1 && m_pp.y == -1 && m_pp.z == -1) || (m_pp.x == -2 && m_pp.y == -2 && m_pp.z == -2)) { if ((m_pp.x == -1 && m_pp.y == -1 && m_pp.z == -1) || (m_pp.x == -2 && m_pp.y == -2 && m_pp.z == -2)) {
m_pp.x = zone->safe_x(); auto safePoint = zone->GetSafePoint();
m_pp.y = zone->safe_y(); m_pp.x = safePoint.m_X;
m_pp.z = zone->safe_z(); m_pp.y = safePoint.m_Y;
m_pp.z = safePoint.m_Z;
} }
/* If too far below ground, then fix */ /* If too far below ground, then fix */
// float ground_z = GetGroundZ(m_pp.x, m_pp.y, m_pp.z); // float ground_z = GetGroundZ(m_pp.x, m_pp.y, m_pp.z);

5
zone/zone.h
View File

@ -109,10 +109,7 @@ public:
inline Timer* GetInstanceTimer() { return Instance_Timer; } inline Timer* GetInstanceTimer() { return Instance_Timer; }
inline xyz_heading GetSafePoint() { return m_SafePoint; } inline xyz_location GetSafePoint() { return m_SafePoint; }
inline const float& safe_x() { return m_SafePoint.m_X; }
inline const float& safe_y() { return m_SafePoint.m_Y; }
inline const float& safe_z() { return m_SafePoint.m_Z; }
inline const uint32& graveyard_zoneid() { return pgraveyard_zoneid; } inline const uint32& graveyard_zoneid() { return pgraveyard_zoneid; }
inline const float& graveyard_x() { return m_Graveyard.m_X; } inline const float& graveyard_x() { return m_Graveyard.m_X; }
inline const float& graveyard_y() { return m_Graveyard.m_Y; } inline const float& graveyard_y() { return m_Graveyard.m_Y; }

8
zone/zoning.cpp
View File

@ -488,13 +488,15 @@ void Client::ZonePC(uint32 zoneID, uint32 instance_id, float x, float y, float z
return; return;
} }
iZoneNameLength = strlen(pZoneName); iZoneNameLength = strlen(pZoneName);
xyz_heading safePoint;
switch(zm) { switch(zm) {
case EvacToSafeCoords: case EvacToSafeCoords:
case ZoneToSafeCoords: case ZoneToSafeCoords:
x = zone->safe_x(); safePoint = zone->GetSafePoint();
y = zone->safe_y(); x = safePoint.m_X;
z = zone->safe_z(); y = safePoint.m_Y;
z = safePoint.m_Z;
SetHeading(heading); SetHeading(heading);
break; break;
case GMSummon: case GMSummon: