diff options
| author | megamage <none@none> | 2009-07-16 11:49:00 +0800 |
|---|---|---|
| committer | megamage <none@none> | 2009-07-16 11:49:00 +0800 |
| commit | 208087ff6ee592150b1ed387bbc135566a02a359 (patch) | |
| tree | 42b3b460ce2276259e2673bc8b254e0812af1fbb /src/game/GameObject.cpp | |
| parent | 762528c5dd7908de47f2c2a7dcc5e7c95eb79744 (diff) | |
[8182] Store and use Map* pointer in WorldObject instead map ids for speedup Author: Ambal
Also some code logic cleanups.
Changes let make more cleanups in base map access and other places,
but this chnages not inlcuded in patch.
*This patch may cause crash.
--HG--
branch : trunk
Diffstat (limited to 'src/game/GameObject.cpp')
| -rw-r--r-- | src/game/GameObject.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/game/GameObject.cpp b/src/game/GameObject.cpp index 56c5bd7529e..d1cf9187aac 100644 --- a/src/game/GameObject.cpp +++ b/src/game/GameObject.cpp @@ -137,9 +137,9 @@ 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); - SetMapId(map->GetId()); - SetInstanceId(map->GetInstanceId()); + SetMap(map); SetPhaseMask(phaseMask,false); if(!IsPositionValid()) |