Lots of cmangos commirs applied

This commit is contained in:
Charles A Edwards 2016-09-12 17:52:23 +01:00 committed by Antz
parent 8431568536
commit 18dd18780d
44 changed files with 677 additions and 323 deletions

View file

@ -452,7 +452,7 @@ enum PlayerFlags
PLAYER_FLAGS_GM = 0x00000008,
PLAYER_FLAGS_GHOST = 0x00000010,
PLAYER_FLAGS_RESTING = 0x00000020,
PLAYER_FLAGS_UNK7 = 0x00000040, // admin?
PLAYER_FLAGS_SANCTUARY = 0x00000040,
PLAYER_FLAGS_UNK8 = 0x00000080, // pre-3.0.3 PLAYER_FLAGS_FFA_PVP flag for FFA PVP state
PLAYER_FLAGS_CONTESTED_PVP = 0x00000100, // Player has been involved in a PvP combat and will be attacked by contested guards
PLAYER_FLAGS_IN_PVP = 0x00000200,
@ -2574,6 +2574,10 @@ class Player : public Unit
void SetTitle(CharTitlesEntry const* title, bool lost = false);
bool canSeeSpellClickOn(Creature const* creature) const;
// function used for raise ally spell
bool IsGhouled() const { return m_isGhouled; }
void SetGhouled(bool enable) { m_isGhouled = enable; }
protected:
uint32 m_contestedPvPTimer;
@ -2899,6 +2903,8 @@ class Player : public Unit
uint32 m_timeSyncServer;
uint32 m_cachedGS;
bool m_isGhouled;
};
void AddItemsSetItem(Player* player, Item* item);