diff options
| author | QAston <none@none> | 2009-08-01 00:20:32 +0200 |
|---|---|---|
| committer | QAston <none@none> | 2009-08-01 00:20:32 +0200 |
| commit | 1d96091d2a4f9a886a4d3cd80ec3c873d395dbdd (patch) | |
| tree | 88589d294e7eb5ccabf7e667970b116e6a2670a6 /src/game/GameObject.cpp | |
| parent | 0db1fd6c26b90241cfe039f2e2b3e35d10cb9cbd (diff) | |
*Improvements in map managing.
--HG--
branch : trunk
Diffstat (limited to 'src/game/GameObject.cpp')
| -rw-r--r-- | src/game/GameObject.cpp | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/src/game/GameObject.cpp b/src/game/GameObject.cpp index b6ac3442c0d..e6ff16f251c 100644 --- a/src/game/GameObject.cpp +++ b/src/game/GameObject.cpp @@ -137,16 +137,17 @@ void GameObject::RemoveFromWorld() bool GameObject::Create(uint32 guidlow, uint32 name_id, Map *map, uint32 phaseMask, float x, float y, float z, float ang, float rotation0, float rotation1, float rotation2, float rotation3, uint32 animprogress, GOState go_state, uint32 ArtKit) { ASSERT(map); - Relocate(x,y,z,ang); SetMap(map); - SetPhaseMask(phaseMask,false); + Relocate(x,y,z,ang); if(!IsPositionValid()) { sLog.outError("Gameobject (GUID: %u Entry: %u ) not created. Suggested coordinates isn't valid (X: %f Y: %f)",guidlow,name_id,x,y); return false; } + SetPhaseMask(phaseMask,false); + GameObjectInfo const* goinfo = objmgr.GetGameObjectInfo(name_id); if (!goinfo) { |