Merge branch 'master' into feature/global-base-scaling

This commit is contained in:
Chris Miles
2018-12-14 02:17:03 -06:00
committed by Chris Miles
24 changed files with 309 additions and 108 deletions
+3 -1
View File
@@ -776,8 +776,10 @@ public:
void UnscribeSpellAll(bool update_client = true);
void UntrainDisc(int slot, bool update_client = true);
void UntrainDiscAll(bool update_client = true);
bool SpellGlobalCheck(uint16 Spell_ID, uint32 Char_ID);
bool SpellGlobalCheck(uint16 spell_id, uint32 char_id);
bool SpellBucketCheck(uint16 spell_id, uint32 char_id);
uint32 GetCharMaxLevelFromQGlobal();
uint32 GetCharMaxLevelFromBucket();
inline bool IsSitting() const {return (playeraction == 1);}
inline bool IsBecomeNPC() const { return npcflag; }