pa/eqemu-server
2
0
Fork 0
mirror of https://github.com/EQEmu/Server.git synced 2026-03-21 21:12:24 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

targetring_x, targetring_y, targetring_z replaced with m_TargetRing as an xyz_location

Browse Source
This commit is contained in:
Arthur Ice 2014-11-25 23:44:02 -08:00
parent d25c5b1fa0
commit cab1f986f1
3 changed files with 7 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
zone/client_packet.cpp
View File

@ -3984,9 +3984,7 @@ void Client::Handle_OP_CastSpell(const EQApplicationPacket *app)
CastSpell_Struct* castspell = (CastSpell_Struct*)app->pBuffer; CastSpell_Struct* castspell = (CastSpell_Struct*)app->pBuffer;
targetring_x = castspell->x_pos; m_TargetRing = xyz_location(castspell->x_pos, castspell->y_pos, castspell->z_pos);
targetring_y = castspell->y_pos;
targetring_z = castspell->z_pos;
#ifdef _EQDEBUG #ifdef _EQDEBUG
LogFile->write(EQEMuLog::Debug, "cs_unknown2: %u %i", (uint8)castspell->cs_unknown[0], castspell->cs_unknown[0]); LogFile->write(EQEMuLog::Debug, "cs_unknown2: %u %i", (uint8)castspell->cs_unknown[0], castspell->cs_unknown[0]);
@ -4018,9 +4016,7 @@ void Client::Handle_OP_CastSpell(const EQApplicationPacket *app)
return; return;
} }
targetring_x = castspell->x_pos; m_TargetRing = xyz_location(castspell->x_pos, castspell->y_pos, castspell->z_pos);
targetring_y = castspell->y_pos;
targetring_z = castspell->z_pos;
CastSpell(spell_to_cast, castspell->target_id, castspell->slot); CastSpell(spell_to_cast, castspell->target_id, castspell->slot);
} }

4
zone/mob.cpp
View File

@ -367,9 +367,7 @@ Mob::Mob(const char* in_name,
nimbus_effect3 = 0; nimbus_effect3 = 0;
m_targetable = true; m_targetable = true;
targetring_x = 0.0f; m_TargetRing = xyz_location::Origin();
targetring_y = 0.0f;
targetring_z = 0.0f;
flymode = FlyMode3; flymode = FlyMode3;
// Pathing // Pathing

10
zone/mob.h
View File

@ -290,9 +290,9 @@ public:
inline virtual uint32 GetNimbusEffect2() const { return nimbus_effect2; } inline virtual uint32 GetNimbusEffect2() const { return nimbus_effect2; }
inline virtual uint32 GetNimbusEffect3() const { return nimbus_effect3; } inline virtual uint32 GetNimbusEffect3() const { return nimbus_effect3; }
void RemoveNimbusEffect(int effectid); void RemoveNimbusEffect(int effectid);
inline float GetTargetRingX() const { return targetring_x; } inline float GetTargetRingX() const { return m_TargetRing.m_X; }
inline float GetTargetRingY() const { return targetring_y; } inline float GetTargetRingY() const { return m_TargetRing.m_Y; }
inline float GetTargetRingZ() const { return targetring_z; } inline float GetTargetRingZ() const { return m_TargetRing.m_Z; }
inline bool HasEndurUpkeep() const { return endur_upkeep; } inline bool HasEndurUpkeep() const { return endur_upkeep; }
inline void SetEndurUpkeep(bool val) { endur_upkeep = val; } inline void SetEndurUpkeep(bool val) { endur_upkeep = val; }
@ -1241,9 +1241,7 @@ protected:
float tar_vz; float tar_vz;
float test_vector; float test_vector;
float targetring_x; xyz_location m_TargetRing;
float targetring_y;
float targetring_z;
uint32 m_spellHitsLeft[38]; // Used to track which spells will have their numhits incremented when spell finishes casting, 38 Buffslots uint32 m_spellHitsLeft[38]; // Used to track which spells will have their numhits incremented when spell finishes casting, 38 Buffslots
int flymode; int flymode;