*Merge.

--HG-- branch : trunk
2009-02-20 12:05:58 -06:00
parent 187cd928ea 956c828bf5
commit 1b587c0fe3
8 changed files with 111 additions and 67 deletions
@@ -1033,6 +1033,7 @@ class TRINITY_DLL_SPEC Player : public Unit
        int GetTimeInnEnter() const { return time_inn_enter; };
        void UpdateInnerTime (int time) { time_inn_enter = time; };

+        Pet* SummonPet(uint32 entry, float x, float y, float z, float ang, PetType petType, uint32 despwtime);
        void RemovePet(Pet* pet, PetSaveMode mode, bool returnreagent = false);
        void RemoveMiniPet();
        Pet* GetMiniPet();