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

tarx, tary, tarz converted to m_TargetLocation as xyz_location

Browse Source
This commit is contained in:
Arthur Ice 2014-11-26 15:10:49 -08:00
parent a6177859ff
commit 75543e68e3
3 changed files with 7 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
zone/mob.cpp
View File

@ -99,6 +99,7 @@ Mob::Mob(const char* in_name,
gravity_timer(1000), gravity_timer(1000),
viral_timer(0), viral_timer(0),
m_FearWalkTarget(-999999.0f,-999999.0f,-999999.0f), m_FearWalkTarget(-999999.0f,-999999.0f,-999999.0f),
m_TargetLocation(0.0f, 0.0f, 0.0f),
flee_timer(FLEE_CHECK_TIMER) flee_timer(FLEE_CHECK_TIMER)
{ {
@ -108,9 +109,6 @@ Mob::Mob(const char* in_name,
tar_vx=0; tar_vx=0;
tar_vy=0; tar_vy=0;
tar_vz=0; tar_vz=0;
tarx=0;
tary=0;
tarz=0;
curfp = false; curfp = false;
AI_Init(); AI_Init();

10
zone/mob.h
View File

@ -399,9 +399,9 @@ public:
inline const float GetHeading() const { return m_Position.m_Heading; } inline const float GetHeading() const { return m_Position.m_Heading; }
inline const float GetSize() const { return size; } inline const float GetSize() const { return size; }
inline const float GetBaseSize() const { return base_size; } inline const float GetBaseSize() const { return base_size; }
inline const float GetTarX() const { return tarx; } inline const float GetTarX() const { return m_TargetLocation.m_X; }
inline const float GetTarY() const { return tary; } inline const float GetTarY() const { return m_TargetLocation.m_Y; }
inline const float GetTarZ() const { return tarz; } inline const float GetTarZ() const { return m_TargetLocation.m_Z; }
inline const float GetTarVX() const { return tar_vx; } inline const float GetTarVX() const { return tar_vx; }
inline const float GetTarVY() const { return tar_vy; } inline const float GetTarVY() const { return tar_vy; }
inline const float GetTarVZ() const { return tar_vz; } inline const float GetTarVZ() const { return tar_vz; }
@ -1227,9 +1227,7 @@ protected:
bool pet_owner_client; //Flags regular and pets as belonging to a client bool pet_owner_client; //Flags regular and pets as belonging to a client
EGNode *_egnode; //the EG node we are in EGNode *_egnode; //the EG node we are in
float tarx; xyz_location m_TargetLocation;
float tary;
float tarz;
uint8 tar_ndx; uint8 tar_ndx;
float tar_vector; float tar_vector;
float tar_vx; float tar_vx;

6
zone/waypoints.cpp
View File

@ -531,7 +531,7 @@ bool Mob::MakeNewPositionAndSendUpdate(float x, float y, float z, float speed, b
} }
int compare_steps = IsBoat() ? 1 : 20; int compare_steps = IsBoat() ? 1 : 20;
if(tar_ndx < compare_steps && tarx==x && tary==y) { if(tar_ndx < compare_steps && m_TargetLocation.m_X==x && m_TargetLocation.m_Y==y) {
float new_x = m_Position.m_X + tar_vx*tar_vector; float new_x = m_Position.m_X + tar_vx*tar_vector;
float new_y = m_Position.m_Y + tar_vy*tar_vector; float new_y = m_Position.m_Y + tar_vy*tar_vector;
@ -590,9 +590,7 @@ bool Mob::MakeNewPositionAndSendUpdate(float x, float y, float z, float speed, b
} else { } else {
tar_ndx=0; tar_ndx=0;
} }
tarx=x; m_TargetLocation = xyz_location(x, y, z);
tary=y;
tarz=z;
float nx = this->m_Position.m_X; float nx = this->m_Position.m_X;
float ny = this->m_Position.m_Y; float ny = this->m_Position.m_Y;