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

spell_x,spell_y, spell_z converted to m_SpellLocation, xyz_location

Browse Source
This commit is contained in:
Arthur Ice 2014-11-25 21:06:13 -08:00
parent 096cbaf1bb
commit 5115a29bb7
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
zone/mob.h
View File

@ -807,10 +807,10 @@ public:
void SetDontCureMeBefore(uint32 time) { pDontCureMeBefore = time; } void SetDontCureMeBefore(uint32 time) { pDontCureMeBefore = time; }
// calculate interruption of spell via movement of mob // calculate interruption of spell via movement of mob
void SaveSpellLoc() {spell_x = m_Position.m_X; spell_y = m_Position.m_Y; spell_z = m_Position.m_Z; } void SaveSpellLoc() {m_SpellLocation = m_Position; }
inline float GetSpellX() const {return spell_x;} inline float GetSpellX() const {return m_SpellLocation.m_X;}
inline float GetSpellY() const {return spell_y;} inline float GetSpellY() const {return m_SpellLocation.m_Y;}
inline float GetSpellZ() const {return spell_z;} inline float GetSpellZ() const {return m_SpellLocation.m_Z;}
inline bool IsGrouped() const { return isgrouped; } inline bool IsGrouped() const { return isgrouped; }
void SetGrouped(bool v); void SetGrouped(bool v);
inline bool IsRaidGrouped() const { return israidgrouped; } inline bool IsRaidGrouped() const { return israidgrouped; }
@ -1069,7 +1069,7 @@ protected:
//spell casting vars //spell casting vars
Timer spellend_timer; Timer spellend_timer;
uint16 casting_spell_id; uint16 casting_spell_id;
float spell_x, spell_y, spell_z; xyz_location m_SpellLocation;
int attacked_count; int attacked_count;
bool delaytimer; bool delaytimer;
uint16 casting_spell_targetid; uint16 casting_spell_targetid;

2
zone/spells.cpp
View File

@ -350,7 +350,7 @@ bool Mob::DoCastSpell(uint16 spell_id, uint16 target_id, uint16 slot,
casting_spell_type = type; casting_spell_type = type;
SaveSpellLoc(); SaveSpellLoc();
mlog(SPELLS__CASTING, "Casting %d Started at (%.3f,%.3f,%.3f)", spell_id, spell_x, spell_y, spell_z); mlog(SPELLS__CASTING, "Casting %d Started at (%.3f,%.3f,%.3f)", spell_id, m_SpellLocation.m_X, m_SpellLocation.m_Y, m_SpellLocation.m_Z);
// if this spell doesn't require a target, or if it's an optional target // if this spell doesn't require a target, or if it's an optional target
// and a target wasn't provided, then it's us; unless TGB is on and this // and a target wasn't provided, then it's us; unless TGB is on and this