diff options
author | megamage <none@none> | 2009-03-19 14:41:30 -0600 |
---|---|---|
committer | megamage <none@none> | 2009-03-19 14:41:30 -0600 |
commit | a2392121f0a8fed9f19ddadfa2880ed6f4691381 (patch) | |
tree | 2089f3b40d4460c7a45cdb9d1429f8bd2f3ea3c3 /src/game/Object.h | |
parent | 74985e84904c46f1e137bed577d0b3806b33b867 (diff) |
*Fix the bug that summon dbc is not read. Now creatures can be summoned.
*Make minipet as tempsummon instead of pet. Make totem as tempsummon.
--HG--
branch : trunk
Diffstat (limited to 'src/game/Object.h')
-rw-r--r-- | src/game/Object.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/game/Object.h b/src/game/Object.h index 7ae42ea3a70..4107a6e5aa4 100644 --- a/src/game/Object.h +++ b/src/game/Object.h @@ -104,6 +104,7 @@ class Player; class UpdateMask; class InstanceData; class GameObject; +class TempSummon; class Vehicle; typedef UNORDERED_MAP<Player*, UpdateData> UpdateDataMapType; @@ -499,7 +500,7 @@ class TRINITY_DLL_SPEC WorldObject : public Object Map * GetMap() const; Map const* GetBaseMap() const; - Creature* SummonCreature(uint32 id, float x, float y, float z, float ang,TempSummonType spwtype,uint32 despwtime); + TempSummon* SummonCreature(uint32 id, float x, float y, float z, float ang,TempSummonType spwtype,uint32 despwtime); Vehicle* SummonVehicle(uint32 entry, float x, float y, float z, float ang); GameObject* SummonGameObject(uint32 entry, float x, float y, float z, float ang, float rotation0, float rotation1, float rotation2, float rotation3, uint32 respawnTime); Creature* SummonTrigger(float x, float y, float z, float ang, uint32 dur, CreatureAI* (*GetAI)(Creature*) = NULL); |