diff options
| author | Shauren <shauren.trinity@gmail.com> | 2011-05-19 18:50:57 +0200 |
|---|---|---|
| committer | Shauren <shauren.trinity@gmail.com> | 2011-05-19 18:50:57 +0200 |
| commit | 49a81557fabdb888916c41b5f0c67ca9f6e795b2 (patch) | |
| tree | aaa685f8e381a3f74e620fd0744d75b7dcd97e1a /src/server/game/Entities/Object | |
| parent | 69376d0e1ce027f3abaf8e1c8757d786789b379e (diff) | |
Core/Units: Fixed totem timer UI
Closes #298
Closes #1595
Diffstat (limited to 'src/server/game/Entities/Object')
| -rwxr-xr-x | src/server/game/Entities/Object/Object.cpp | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/src/server/game/Entities/Object/Object.cpp b/src/server/game/Entities/Object/Object.cpp index 907d62ad5e8..8b4efe51de7 100755 --- a/src/server/game/Entities/Object/Object.cpp +++ b/src/server/game/Entities/Object/Object.cpp @@ -2067,7 +2067,7 @@ void WorldObject::AddObjectToRemoveList() map->AddObjectToRemoveList(this); } -TempSummon *Map::SummonCreature(uint32 entry, const Position &pos, SummonPropertiesEntry const *properties, uint32 duration, Unit *summoner, uint32 vehId) +TempSummon* Map::SummonCreature(uint32 entry, const Position &pos, SummonPropertiesEntry const *properties /*= NULL*/, uint32 duration /*= 0*/, Unit *summoner /*= NULL*/, uint32 vehId /*= 0*/, bool addToWorld /*= false*/) { uint32 mask = UNIT_MASK_SUMMON; if (properties) @@ -2128,7 +2128,8 @@ TempSummon *Map::SummonCreature(uint32 entry, const Position &pos, SummonPropert summon->SetHomePosition(pos); summon->InitStats(duration); - Add(summon->ToCreature()); + if (addToWorld) + Add(summon->ToCreature()); summon->InitSummon(); //ObjectAccessor::UpdateObjectVisibility(summon); |