From fb1d5842eac17d76853652c309d5d7054cbc15ab Mon Sep 17 00:00:00 2001
From: Arthur Ice <addtheice@gmail.com>
Date: Mon, 1 Dec 2014 00:03:59 -0800
Subject: [PATCH] proximity_x, proximity_y, and proximity_z converted to
 xyz_location m_Proximity

---
 zone/client.cpp        |  6 ++----
 zone/client.h          | 13 +++++--------
 zone/client_packet.cpp |  5 ++---
 zone/zoning.cpp        |  4 +---
 4 files changed, 10 insertions(+), 18 deletions(-)

diff --git a/zone/client.cpp b/zone/client.cpp
index fd229f29d..7cff859b2 100644
--- a/zone/client.cpp
+++ b/zone/client.cpp
@@ -155,7 +155,8 @@ Client::Client(EQStreamInterface* ieqs)
 	RespawnFromHoverTimer(0),
 	merc_timer(RuleI(Mercs, UpkeepIntervalMS)),
 	ItemTickTimer(10000),
-	ItemQuestTimer(500)
+	ItemQuestTimer(500),
+	m_Proximity(FLT_MAX, FLT_MAX, FLT_MAX) //arbitrary large number
 {
 	for(int cf=0; cf < _FilterCount; cf++)
 		ClientFilters[cf] = FilterShow;
@@ -208,9 +209,6 @@ Client::Client(EQStreamInterface* ieqs)
 	zonesummon_ignorerestrictions = 0;
 	zoning = false;
 	zone_mode = ZoneUnsolicited;
-	proximity_x = FLT_MAX;	//arbitrary large number
-	proximity_y = FLT_MAX;
-	proximity_z = FLT_MAX;
 	casting_spell_id = 0;
 	npcflag = false;
 	npclevel = 0;
diff --git a/zone/client.h b/zone/client.h
index 80053a263..0bba0d931 100644
--- a/zone/client.h
+++ b/zone/client.h
@@ -393,10 +393,10 @@ public:
 
 	inline const char* GetLastName() const { return lastname; }
 
-	inline float ProximityX() const { return(proximity_x); }
-	inline float ProximityY() const { return(proximity_y); }
-	inline float ProximityZ() const { return(proximity_z); }
-	inline void ClearAllProximities() { entity_list.ProcessMove(this, xyz_location(FLT_MAX, FLT_MAX, FLT_MAX)); proximity_x = FLT_MAX; proximity_y = FLT_MAX; proximity_z = FLT_MAX; }
+	inline float ProximityX() const { return m_Proximity.m_X; }
+	inline float ProximityY() const { return m_Proximity.m_Y; }
+	inline float ProximityZ() const { return m_Proximity.m_Z; }
+	inline void ClearAllProximities() { entity_list.ProcessMove(this, xyz_location(FLT_MAX, FLT_MAX, FLT_MAX)); m_Proximity = xyz_location(FLT_MAX,FLT_MAX,FLT_MAX); }
 
 	/*
 			Begin client modifiers
@@ -1409,10 +1409,7 @@ private:
 	Timer RespawnFromHoverTimer;
 	Timer merc_timer;
 
-	float proximity_x;
-	float proximity_y;
-	float proximity_z;
-
+    xyz_location m_Proximity;
 
 	void BulkSendInventoryItems();
 
diff --git a/zone/client_packet.cpp b/zone/client_packet.cpp
index 31d7a192f..1346b20e6 100644
--- a/zone/client_packet.cpp
+++ b/zone/client_packet.cpp
@@ -4543,9 +4543,8 @@ void Client::Handle_OP_ClientUpdate(const EQApplicationPacket *app)
 		entity_list.ProcessMove(this, xyz_location(ppu->x_pos, ppu->y_pos, ppu->z_pos));
 		if(RuleB(TaskSystem, EnableTaskSystem) && RuleB(TaskSystem,EnableTaskProximity))
 			ProcessTaskProximities(ppu->x_pos, ppu->y_pos, ppu->z_pos);
-		proximity_x = ppu->x_pos;
-		proximity_y = ppu->y_pos;
-		proximity_z = ppu->z_pos;
+
+		m_Proximity = xyz_location(ppu->x_pos, ppu->y_pos, ppu->z_pos);
 	}
 
 	// Update internal state
diff --git a/zone/zoning.cpp b/zone/zoning.cpp
index 4dc99dd2b..3032662ab 100644
--- a/zone/zoning.cpp
+++ b/zone/zoning.cpp
@@ -653,9 +653,7 @@ void Client::ZonePC(uint32 zoneID, uint32 instance_id, float x, float y, float z
 			if(zoneID == GetZoneID()) {
 				//properly handle proximities
 				entity_list.ProcessMove(this, m_Position);
-				proximity_x = m_Position.m_X;
-				proximity_y = m_Position.m_Y;
-				proximity_z = m_Position.m_Z;
+				m_Proximity = m_Position;
 
 				//send out updates to people in zone.
 				SendPosition();