From dac3af89ec26f67a643d2c67f88b004e40dbd906 Mon Sep 17 00:00:00 2001
From: silverice <none@none>
Date: Sun, 21 Mar 2010 01:24:25 +0200
Subject: revert Fix Object::IsInMap to check instanceId if pointers differens,
 maps can't be same

--HG--
branch : trunk
---
 src/game/Object.h | 4 ----
 1 file changed, 4 deletions(-)

(limited to 'src/game/Object.h')

diff --git a/src/game/Object.h b/src/game/Object.h
index 82da2e4bdb6..20907fc9d12 100644
--- a/src/game/Object.h
+++ b/src/game/Object.h
@@ -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
-- 
cgit v1.2.3