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

replaced _preSummonX, _preSummonY, and _preSummonZ in bot with xyz_location m_PreSummonlocation

Browse Source
This commit is contained in:
Arthur Ice 2014-11-30 19:14:24 -08:00
parent 6b1b083802
commit 381dc7574f
2 changed files with 10 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
zone/bot.cpp
View File

@ -16279,11 +16279,9 @@ bool Bot::HasOrMayGetAggro() {
void Bot::SetHasBeenSummoned(bool wasSummoned) { void Bot::SetHasBeenSummoned(bool wasSummoned) {
_hasBeenSummoned = wasSummoned; _hasBeenSummoned = wasSummoned;
if(!wasSummoned) { if(!wasSummoned)
_preSummonX = 0; m_PreSummonLocation = xyz_location::Origin();
_preSummonY = 0;
_preSummonZ = 0;
}
} }
void Bot::SetDefaultBotStance() { void Bot::SetDefaultBotStance() {

16
zone/bot.h
View File

@ -448,9 +448,9 @@ public:
uint32 GetAA(uint32 aa_id); uint32 GetAA(uint32 aa_id);
void ApplyAABonuses(uint32 aaid, uint32 slots, StatBonuses* newbon); void ApplyAABonuses(uint32 aaid, uint32 slots, StatBonuses* newbon);
bool GetHasBeenSummoned() { return _hasBeenSummoned; } bool GetHasBeenSummoned() { return _hasBeenSummoned; }
float GetPreSummonX() { return _preSummonX; } float GetPreSummonX() { return m_PreSummonLocation.m_X; }
float GetPreSummonY() { return _preSummonY; } float GetPreSummonY() { return m_PreSummonLocation.m_Y; }
float GetPreSummonZ() { return _preSummonZ; } float GetPreSummonZ() { return m_PreSummonLocation.m_Z; }
bool GetGroupMessagesOn() { return _groupMessagesOn; } bool GetGroupMessagesOn() { return _groupMessagesOn; }
bool GetInHealRotation() { return _isInHealRotation; } bool GetInHealRotation() { return _isInHealRotation; }
bool GetHealRotationActive() { return (GetInHealRotation() && _isHealRotationActive); } bool GetHealRotationActive() { return (GetInHealRotation() && _isHealRotationActive); }
@ -535,9 +535,9 @@ public:
void SetSpellRecastTimer(int timer_index, int32 recast_delay); void SetSpellRecastTimer(int timer_index, int32 recast_delay);
void SetDisciplineRecastTimer(int timer_index, int32 recast_delay); void SetDisciplineRecastTimer(int timer_index, int32 recast_delay);
void SetHasBeenSummoned(bool s); void SetHasBeenSummoned(bool s);
void SetPreSummonX(float x) { _preSummonX = x; } void SetPreSummonX(float x) { m_PreSummonLocation.m_X = x; }
void SetPreSummonY(float y) { _preSummonY = y; } void SetPreSummonY(float y) { m_PreSummonLocation.m_Y = y; }
void SetPreSummonZ(float z) { _preSummonZ = z; } void SetPreSummonZ(float z) { m_PreSummonLocation.m_Z = z; }
void SetGroupMessagesOn(bool groupMessagesOn) { _groupMessagesOn = groupMessagesOn; } void SetGroupMessagesOn(bool groupMessagesOn) { _groupMessagesOn = groupMessagesOn; }
void SetInHealRotation( bool inRotation ) { _isInHealRotation = inRotation; } void SetInHealRotation( bool inRotation ) { _isInHealRotation = inRotation; }
void SetHealRotationActive( bool isActive ) { _isHealRotationActive = isActive; } void SetHealRotationActive( bool isActive ) { _isHealRotationActive = isActive; }
@ -604,9 +604,7 @@ private:
int32 end_regen; int32 end_regen;
uint32 timers[MaxTimer]; uint32 timers[MaxTimer];
bool _hasBeenSummoned; bool _hasBeenSummoned;
float _preSummonX; xyz_location m_PreSummonLocation;
float _preSummonY;
float _preSummonZ;
uint8 _spellCastingChances[MaxStances][MaxSpellTypes]; uint8 _spellCastingChances[MaxStances][MaxSpellTypes];
bool _groupMessagesOn; bool _groupMessagesOn;
bool _isInHealRotation; bool _isInHealRotation;