Over 100 camangos Cata commits applied (to c12950)

Over 100 camangos Cata commits applied. up to and inclusing c12950.
This commit is contained in:
Charles A Edwards 2016-08-20 17:10:24 +01:00 committed by Antz
parent b4ec0440aa
commit eef77eadb9
117 changed files with 4314 additions and 3547 deletions

View file

@ -60,7 +60,6 @@ class PlayerSocial;
class DungeonPersistentState;
class Spell;
class Item;
class PhaseMgr;
struct AreaTrigger;
@ -1209,7 +1208,7 @@ class Player : public Unit
void RemovePet(PetSaveMode mode);
PhaseMgr* GetPhaseMgr() { return phaseMgr; }
uint32 GetPhaseMaskForSpawn() const; // used for proper set phase for DB at GM-mode creature/GO spawn
void Say(const std::string& text, const uint32 language);
void Yell(const std::string& text, const uint32 language);
@ -2854,8 +2853,6 @@ class Player : public Unit
uint32 m_timeSyncServer;
uint32 m_cachedGS;
PhaseMgr* phaseMgr;
};
void AddItemsSetItem(Player* player, Item* item);