*Fix a crash.

--HG--
branch : trunk
This commit is contained in:
megamage
2009-03-03 19:07:52 -06:00
parent aca0f0b497
commit e3eba9331e
4 changed files with 28 additions and 18 deletions

View File

@@ -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;
}