pa/eqemu-server
2
0
Fork 0
mirror of https://github.com/EQEmu/Server.git synced 2025-12-13 18:51:29 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

psafe_x, psafe_y, and psafe_z replaced with xyz_location m_SafePoint

Browse Source
This commit is contained in:
Arthur Ice 2014-12-01 22:35:46 -08:00
parent f5a94ed07b
commit 40ec1f805f
2 changed files with 7 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
zone/zone.cpp
View File

@ -750,7 +750,8 @@ Zone::Zone(uint32 in_zoneid, uint32 in_instanceid, const char* in_short_name)
clientauth_timer(AUTHENTICATION_TIMEOUT * 1000), clientauth_timer(AUTHENTICATION_TIMEOUT * 1000),
spawn2_timer(1000), spawn2_timer(1000),
qglobal_purge_timer(30000), qglobal_purge_timer(30000),
hotzone_timer(120000) hotzone_timer(120000),
m_SafePoint(0.0f,0.0f,0.0f)
{ {
zoneid = in_zoneid; zoneid = in_zoneid;
instanceid = in_instanceid; instanceid = in_instanceid;
@ -777,9 +778,6 @@ Zone::Zone(uint32 in_zoneid, uint32 in_instanceid, const char* in_short_name)
long_name = 0; long_name = 0;
aggroedmobs =0; aggroedmobs =0;
psafe_x = 0;
psafe_y = 0;
psafe_z = 0;
pgraveyard_id = 0; pgraveyard_id = 0;
pgraveyard_zoneid = 0; pgraveyard_zoneid = 0;
pgraveyard_x = 0; pgraveyard_x = 0;
@ -791,7 +789,7 @@ Zone::Zone(uint32 in_zoneid, uint32 in_instanceid, const char* in_short_name)
pvpzone = false; pvpzone = false;
if(database.GetServerType() == 1) if(database.GetServerType() == 1)
pvpzone = true; pvpzone = true;
database.GetZoneLongName(short_name, &long_name, file_name, &psafe_x, &psafe_y, &psafe_z, &pgraveyard_id, &pMaxClients); database.GetZoneLongName(short_name, &long_name, file_name, &m_SafePoint.m_X, &m_SafePoint.m_Y, &m_SafePoint.m_Z, &pgraveyard_id, &pMaxClients);
if(graveyard_id() > 0) if(graveyard_id() > 0)
{ {
LogFile->write(EQEMuLog::Debug, "Graveyard ID is %i.", graveyard_id()); LogFile->write(EQEMuLog::Debug, "Graveyard ID is %i.", graveyard_id());

8
zone/zone.h
View File

@ -109,9 +109,9 @@ public:
inline Timer* GetInstanceTimer() { return Instance_Timer; } inline Timer* GetInstanceTimer() { return Instance_Timer; }
inline const float& safe_x() { return psafe_x; } inline const float& safe_x() { return m_SafePoint.m_X; }
inline const float& safe_y() { return psafe_y; } inline const float& safe_y() { return m_SafePoint.m_Y; }
inline const float& safe_z() { return psafe_z; } 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 pgraveyard_x; } inline const float& graveyard_x() { return pgraveyard_x; }
inline const float& graveyard_y() { return pgraveyard_y; } inline const float& graveyard_y() { return pgraveyard_y; }
@ -281,7 +281,7 @@ private:
char* long_name; char* long_name;
char* map_name; char* map_name;
bool pvpzone; bool pvpzone;
float psafe_x, psafe_y, psafe_z; xyz_location m_SafePoint;
uint32 pMaxClients; uint32 pMaxClients;
bool can_bind; bool can_bind;
bool is_city; bool is_city;