diff options
| author | BroodWyrm <none@none> | 2009-04-21 21:02:03 +0200 |
|---|---|---|
| committer | BroodWyrm <none@none> | 2009-04-21 21:02:03 +0200 |
| commit | e20e65ced9efd11a009fd63bcd4047ecc4bd3e63 (patch) | |
| tree | 8607f4b20e262ccbd360f0ee122fc34a8ba72d5a /src/game/Object.h | |
| parent | daa03d409e0e4b2d5b8f2526796c51a120d03604 (diff) | |
| parent | 6c38623dfc917836c747293e3fff439432a169a1 (diff) | |
*Merge.
--HG--
branch : trunk
Diffstat (limited to 'src/game/Object.h')
| -rw-r--r-- | src/game/Object.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/game/Object.h b/src/game/Object.h index 455484eea2d..eff964aba0f 100644 --- a/src/game/Object.h +++ b/src/game/Object.h @@ -518,8 +518,8 @@ class TRINITY_DLL_SPEC WorldObject : public Object Map * GetMap() const { return m_map ? m_map : const_cast<WorldObject*>(this)->_getMap(); } Map * FindMap() const { return m_map ? m_map : const_cast<WorldObject*>(this)->_findMap(); } Map const* GetBaseMap() const; - 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); + TempSummon* SummonCreature(uint32 id, float x, float y, float z, float ang = 0,TempSummonType spwtype = TEMPSUMMON_MANUAL_DESPAWN,uint32 despwtime = 0); + Vehicle* SummonVehicle(uint32 entry, float x, float y, float z, float ang = 0); 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); bool isActiveObject() const { return m_isActive; } |