diff options
| author | Vincent-Michael <Vincent_Michael@gmx.de> | 2014-04-25 23:42:40 +0200 |
|---|---|---|
| committer | Vincent-Michael <Vincent_Michael@gmx.de> | 2014-04-25 23:42:40 +0200 |
| commit | 1390621f4da88d6749e42bea0a131fae74742fa4 (patch) | |
| tree | 5c6b3c03866feb85ade9f5f95b5cb7cbd5617f61 /src/server/game/AI/CreatureAI.cpp | |
| parent | 7edfbaeb6ee667584b14fc3f59189aa762ae38c5 (diff) | |
| parent | c81d6e9b4bec14a46fd4eb01ce51d874a12bf5f7 (diff) | |
Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4
Conflicts:
src/server/game/Handlers/MiscHandler.cpp
src/server/scripts/Commands/cs_reload.cpp
Diffstat (limited to 'src/server/game/AI/CreatureAI.cpp')
| -rw-r--r-- | src/server/game/AI/CreatureAI.cpp | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/src/server/game/AI/CreatureAI.cpp b/src/server/game/AI/CreatureAI.cpp index 07c75eb424f..dd8b42deb9f 100644 --- a/src/server/game/AI/CreatureAI.cpp +++ b/src/server/game/AI/CreatureAI.cpp @@ -252,15 +252,13 @@ Creature* CreatureAI::DoSummon(uint32 entry, const Position& pos, uint32 despawn Creature* CreatureAI::DoSummon(uint32 entry, WorldObject* obj, float radius, uint32 despawnTime, TempSummonType summonType) { - Position pos; - obj->GetRandomNearPosition(pos, radius); + Position pos = obj->GetRandomNearPosition(radius); return me->SummonCreature(entry, pos, summonType, despawnTime); } Creature* CreatureAI::DoSummonFlyer(uint32 entry, WorldObject* obj, float flightZ, float radius, uint32 despawnTime, TempSummonType summonType) { - Position pos; - obj->GetRandomNearPosition(pos, radius); + Position pos = obj->GetRandomNearPosition(radius); pos.m_positionZ += flightZ; return me->SummonCreature(entry, pos, summonType, despawnTime); } |