fix(Core/Entities): extend combo point system to all Units (#9816)

- Closes #1140
This commit is contained in:
UltraNix
2022-01-07 11:18:03 +01:00
committed by GitHub
parent 2e6213d526
commit 2c6a692000
9 changed files with 217 additions and 182 deletions

View File

@@ -1582,13 +1582,6 @@ public:
void SetTarget(ObjectGuid /*guid*/ = ObjectGuid::Empty) override { } /// Used for serverside target changes, does not apply to players
void SetSelection(ObjectGuid guid);
[[nodiscard]] uint8 GetComboPoints() const { return m_comboPoints; }
[[nodiscard]] ObjectGuid GetComboTarget() const { return m_comboTarget; }
void AddComboPoints(Unit* target, int8 count);
void ClearComboPoints();
void SendComboPoints();
void SendMailResult(uint32 mailId, MailResponseType mailAction, MailResponseResult mailError, uint32 equipError = 0, ObjectGuid::LowType item_guid = 0, uint32 item_count = 0);
void SendNewMail();
void UpdateNextMailTimeAndUnreads();
@@ -2562,9 +2555,6 @@ public:
void PrepareCharmAISpells();
uint32 m_charmUpdateTimer;
int8 GetComboPointGain() { return m_comboPointGain; }
void SetComboPointGain(int8 combo) { m_comboPointGain = combo; }
bool NeedToSaveGlyphs() { return m_NeedToSaveGlyphs; }
void SetNeedToSaveGlyphs(bool val) { m_NeedToSaveGlyphs = val; }
@@ -2610,8 +2600,6 @@ public:
// Gamemaster whisper whitelist
WhisperListContainer WhisperList;
// Combo Points
int8 m_comboPointGain;
// Performance Varibales
bool m_NeedToSaveGlyphs;
// Mount block bug
@@ -2753,9 +2741,6 @@ public:
uint32 m_ExtraFlags;
ObjectGuid m_comboTarget;
int8 m_comboPoints;
QuestStatusMap m_QuestStatus;
QuestStatusSaveMap m_QuestStatusSave;