revert Fix Object::IsInMap to check instanceId
if pointers differens, maps can't be same --HG-- branch : trunk
This commit is contained in:
@@ -562,10 +562,6 @@ class WorldObject : public Object, public WorldLocation
|
|||||||
{
|
{
|
||||||
if (!obj || !IsInWorld() || !(obj->IsInWorld()) || GetMap() != obj->GetMap() || !InSamePhase(obj))
|
if (!obj || !IsInWorld() || !(obj->IsInWorld()) || GetMap() != obj->GetMap() || !InSamePhase(obj))
|
||||||
return false;
|
return false;
|
||||||
|
|
||||||
if (GetMap()->Instanceable() && GetInstanceId() != obj->GetInstanceId())
|
|
||||||
return false;
|
|
||||||
|
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
bool IsWithinDist3d(float x, float y, float z, float dist) const
|
bool IsWithinDist3d(float x, float y, float z, float dist) const
|
||||||
|
|||||||
Reference in New Issue
Block a user