diff options
| author | megamage <none@none> | 2009-02-12 17:09:15 -0600 |
|---|---|---|
| committer | megamage <none@none> | 2009-02-12 17:09:15 -0600 |
| commit | 6aee5fcbe7473a3cbac12b7e8482a7b98bef8be3 (patch) | |
| tree | 91ec91d5c19eba9c2fe0e84b1c9dc7047a3de80e /src/game/Object.cpp | |
| parent | 2d2f433b4de1c35b22aaf07854fc0ee11fcb350d (diff) | |
| parent | f385747164c3fb278c92ef46fbd6c3da6590bbf0 (diff) | |
*Merge.
--HG--
branch : trunk
Diffstat (limited to 'src/game/Object.cpp')
| -rw-r--r-- | src/game/Object.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/game/Object.cpp b/src/game/Object.cpp index 7310c1ad32f..14a893f243e 100644 --- a/src/game/Object.cpp +++ b/src/game/Object.cpp @@ -1629,8 +1629,8 @@ Creature* WorldObject::SummonCreature(uint32 id, float x, float y, float z, floa return NULL; } - pCreature->SetHomePosition(x, y, z, ang); - pCreature->Summon(spwtype, despwtime); + pCreature->SetHomePosition(x, y, z, ang); + pCreature->Summon(spwtype, despwtime); if(GetTypeId()==TYPEID_UNIT && ((Creature*)this)->AI()) ((Creature*)this)->AI()->JustSummoned(pCreature); @@ -1703,9 +1703,9 @@ void WorldObject::GetNearPoint(WorldObject const* searcher, float &x, float &y, { GetNearPoint2D(x,y,distance2d+searcher_size,absAngle); - z = GetPositionZ(); + z = GetPositionZ(); - UpdateGroundPositionZ(x,y,z); + UpdateGroundPositionZ(x,y,z); } void WorldObject::GetGroundPoint(float &x, float &y, float &z, float dist, float angle) |