diff options
| author | megamage <none@none> | 2009-03-03 19:07:52 -0600 |
|---|---|---|
| committer | megamage <none@none> | 2009-03-03 19:07:52 -0600 |
| commit | e3eba9331ee21011049c6ef4cdaa101144ed9c47 (patch) | |
| tree | 399c425d64e011019c43758269807681d1567cf7 /src/game/Map.cpp | |
| parent | aca0f0b497c76e9d4e96f55793417f614d7845ca (diff) | |
*Fix a crash.
--HG--
branch : trunk
Diffstat (limited to 'src/game/Map.cpp')
| -rw-r--r-- | src/game/Map.cpp | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/src/game/Map.cpp b/src/game/Map.cpp index cb472947169..1bb000b6d80 100644 --- a/src/game/Map.cpp +++ b/src/game/Map.cpp @@ -339,19 +339,23 @@ void Map::SwitchGridContainers(T* obj, bool on) if(on) { - if(!grid.RemoveGridObject<T>(obj, obj->GetGUID()) + grid.RemoveGridObject<T>(obj, obj->GetGUID()); + grid.AddWorldObject<T>(obj, obj->GetGUID()); + /*if(!grid.RemoveGridObject<T>(obj, obj->GetGUID()) || !grid.AddWorldObject<T>(obj, obj->GetGUID())) { assert(false); - } + }*/ } else { - if(!grid.RemoveWorldObject<T>(obj, obj->GetGUID()) + grid.RemoveWorldObject<T>(obj, obj->GetGUID()); + grid.AddGridObject<T>(obj, obj->GetGUID()); + /*if(!grid.RemoveWorldObject<T>(obj, obj->GetGUID()) || !grid.AddGridObject<T>(obj, obj->GetGUID())) { assert(false); - } + }*/ } obj->IsTempWorldObject = on; } |