From f973d256dc966f0d6853fc3ae0c1c3b0100b92f7 Mon Sep 17 00:00:00 2001 From: Arthur Ice Date: Mon, 1 Dec 2014 01:12:19 -0800 Subject: [PATCH] aa_los_me and aa_los_me_heading converted xyz_heading m_AutoAttackPosition --- zone/client.cpp | 7 ++----- zone/client.h | 3 +-- zone/client_packet.cpp | 15 +++------------ zone/client_process.cpp | 20 +++++++------------- 4 files changed, 13 insertions(+), 32 deletions(-) diff --git a/zone/client.cpp b/zone/client.cpp index c894a0ad9..c4aab1733 100644 --- a/zone/client.cpp +++ b/zone/client.cpp @@ -157,7 +157,8 @@ Client::Client(EQStreamInterface* ieqs) ItemTickTimer(10000), ItemQuestTimer(500), m_Proximity(FLT_MAX, FLT_MAX, FLT_MAX), //arbitrary large number - m_ZoneSummonLocation(-2.0f,-2.0f,-2.0f) + m_ZoneSummonLocation(-2.0f,-2.0f,-2.0f), + m_AutoAttackPosition(0.0f, 0.0f, 0.0f, 0.0f) { for(int cf=0; cf < _FilterCount; cf++) ClientFilters[cf] = FilterShow; @@ -275,10 +276,6 @@ Client::Client(EQStreamInterface* ieqs) m_AssistExemption = 0; m_CheatDetectMoved = false; CanUseReport = true; - aa_los_me.x = 0; - aa_los_me.y = 0; - aa_los_me.z = 0; - aa_los_me_heading = 0; aa_los_them.x = 0; aa_los_them.y = 0; aa_los_them.z = 0; diff --git a/zone/client.h b/zone/client.h index 53a8ad521..ad2414d60 100644 --- a/zone/client.h +++ b/zone/client.h @@ -1211,11 +1211,10 @@ protected: Mob* bind_sight_target; - Map::Vertex aa_los_me; + xyz_heading m_AutoAttackPosition; Map::Vertex aa_los_them; Mob *aa_los_them_mob; bool los_status; - float aa_los_me_heading; bool los_status_facing; QGlobalCache *qGlobals; diff --git a/zone/client_packet.cpp b/zone/client_packet.cpp index 1346b20e6..fbbce9e83 100644 --- a/zone/client_packet.cpp +++ b/zone/client_packet.cpp @@ -3224,10 +3224,7 @@ void Client::Handle_OP_AutoAttack(const EQApplicationPacket *app) ranged_timer.Disable(); attack_dw_timer.Disable(); - aa_los_me.x = 0; - aa_los_me.y = 0; - aa_los_me.z = 0; - aa_los_me_heading = 0; + m_AutoAttackPosition = xyz_heading::Origin(); aa_los_them.x = 0; aa_los_them.y = 0; aa_los_them.z = 0; @@ -3244,10 +3241,7 @@ void Client::Handle_OP_AutoAttack(const EQApplicationPacket *app) if (GetTarget()) { aa_los_them_mob = GetTarget(); - aa_los_me.x = GetX(); - aa_los_me.y = GetY(); - aa_los_me.z = GetZ(); - aa_los_me_heading = GetHeading(); + m_AutoAttackPosition = GetPosition(); aa_los_them.x = aa_los_them_mob->GetX(); aa_los_them.y = aa_los_them_mob->GetY(); aa_los_them.z = aa_los_them_mob->GetZ(); @@ -3256,10 +3250,7 @@ void Client::Handle_OP_AutoAttack(const EQApplicationPacket *app) } else { - aa_los_me.x = GetX(); - aa_los_me.y = GetY(); - aa_los_me.z = GetZ(); - aa_los_me_heading = GetHeading(); + m_AutoAttackPosition = GetPosition(); aa_los_them.x = 0; aa_los_them.y = 0; aa_los_them.z = 0; diff --git a/zone/client_process.cpp b/zone/client_process.cpp index 14f26f4df..22498e4ab 100644 --- a/zone/client_process.cpp +++ b/zone/client_process.cpp @@ -354,38 +354,32 @@ bool Client::Process() { if(aa_los_them_mob) { if(auto_attack_target != aa_los_them_mob || - aa_los_me.x != GetX() || - aa_los_me.y != GetY() || - aa_los_me.z != GetZ() || + m_AutoAttackPosition.m_X != GetX() || + m_AutoAttackPosition.m_Y != GetY() || + m_AutoAttackPosition.m_Z != GetZ() || aa_los_them.x != aa_los_them_mob->GetX() || aa_los_them.y != aa_los_them_mob->GetY() || aa_los_them.z != aa_los_them_mob->GetZ()) { aa_los_them_mob = auto_attack_target; - aa_los_me.x = GetX(); - aa_los_me.y = GetY(); - aa_los_me.z = GetZ(); + m_AutoAttackPosition = GetPosition(); aa_los_them.x = aa_los_them_mob->GetX(); aa_los_them.y = aa_los_them_mob->GetY(); aa_los_them.z = aa_los_them_mob->GetZ(); los_status = CheckLosFN(auto_attack_target); - aa_los_me_heading = GetHeading(); los_status_facing = IsFacingMob(aa_los_them_mob); } // If only our heading changes, we can skip the CheckLosFN call // but above we still need to update los_status_facing - if (aa_los_me_heading != GetHeading()) { - aa_los_me_heading = GetHeading(); + if (m_AutoAttackPosition.m_Heading != GetHeading()) { + m_AutoAttackPosition.m_Heading = GetHeading(); los_status_facing = IsFacingMob(aa_los_them_mob); } } else { aa_los_them_mob = auto_attack_target; - aa_los_me.x = GetX(); - aa_los_me.y = GetY(); - aa_los_me.z = GetZ(); - aa_los_me_heading = GetHeading(); + m_AutoAttackPosition = GetPosition(); aa_los_them.x = aa_los_them_mob->GetX(); aa_los_them.y = aa_los_them_mob->GetY(); aa_los_them.z = aa_los_them_mob->GetZ();