revert Fix Object::IsInMap to check instanceId

if pointers differens, maps can't be same

--HG--
branch : trunk
This commit is contained in:
silverice
2010-03-21 01:24:25 +02:00
parent a0fd280a34
commit dac3af89ec

View File

@@ -562,10 +562,6 @@ class WorldObject : public Object, public WorldLocation
{
if (!obj || !IsInWorld() || !(obj->IsInWorld()) || GetMap() != obj->GetMap() || !InSamePhase(obj))
return false;
if (GetMap()->Instanceable() && GetInstanceId() != obj->GetInstanceId())
return false;
return true;
}
bool IsWithinDist3d(float x, float y, float z, float dist) const