From 40ec1f805f1754662f49d2f744d91925b8773e8d Mon Sep 17 00:00:00 2001
From: Arthur Ice <addtheice@gmail.com>
Date: Mon, 1 Dec 2014 22:35:46 -0800
Subject: [PATCH] psafe_x, psafe_y, and psafe_z replaced with xyz_location
 m_SafePoint

---
 zone/zone.cpp | 8 +++-----
 zone/zone.h   | 8 ++++----
 2 files changed, 7 insertions(+), 9 deletions(-)

diff --git a/zone/zone.cpp b/zone/zone.cpp
index 292d4fc79..73ea2c643 100644
--- a/zone/zone.cpp
+++ b/zone/zone.cpp
@@ -750,7 +750,8 @@ Zone::Zone(uint32 in_zoneid, uint32 in_instanceid, const char* in_short_name)
 	clientauth_timer(AUTHENTICATION_TIMEOUT * 1000),
 	spawn2_timer(1000),
 	qglobal_purge_timer(30000),
-	hotzone_timer(120000)
+	hotzone_timer(120000),
+	m_SafePoint(0.0f,0.0f,0.0f)
 {
 	zoneid = in_zoneid;
 	instanceid = in_instanceid;
@@ -777,9 +778,6 @@ Zone::Zone(uint32 in_zoneid, uint32 in_instanceid, const char* in_short_name)
 	long_name = 0;
 	aggroedmobs =0;
 
-	psafe_x = 0;
-	psafe_y = 0;
-	psafe_z = 0;
 	pgraveyard_id = 0;
 	pgraveyard_zoneid = 0;
 	pgraveyard_x = 0;
@@ -791,7 +789,7 @@ Zone::Zone(uint32 in_zoneid, uint32 in_instanceid, const char* in_short_name)
 	pvpzone = false;
 	if(database.GetServerType() == 1)
 		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)
 	{
 		LogFile->write(EQEMuLog::Debug, "Graveyard ID is %i.", graveyard_id());
diff --git a/zone/zone.h b/zone/zone.h
index e0a89ac50..7553a855d 100644
--- a/zone/zone.h
+++ b/zone/zone.h
@@ -109,9 +109,9 @@ public:
 
 	inline Timer* GetInstanceTimer() { return Instance_Timer; }
 
-	inline const float&	safe_x()		{ return psafe_x; }
-	inline const float&	safe_y()		{ return psafe_y; }
-	inline const float&	safe_z()		{ return psafe_z; }
+	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 float& graveyard_x()	{ return pgraveyard_x; }
 	inline const float& graveyard_y()	{ return pgraveyard_y; }
@@ -281,7 +281,7 @@ private:
 	char*	long_name;
 	char*	map_name;
 	bool pvpzone;
-	float	psafe_x, psafe_y, psafe_z;
+	xyz_location m_SafePoint;
 	uint32	pMaxClients;
 	bool	can_bind;
 	bool	is_city;