diff options
| author | silverice <none@none> | 2010-03-21 01:24:25 +0200 |
|---|---|---|
| committer | silverice <none@none> | 2010-03-21 01:24:25 +0200 |
| commit | dac3af89ec26f67a643d2c67f88b004e40dbd906 (patch) | |
| tree | d5eb9afc90856ee9aca23aaaf94f5afa19647630 /src/game | |
| parent | a0fd280a34b6e7c2c6bf3570d0420675222950ba (diff) | |
revert Fix Object::IsInMap to check instanceId
if pointers differens, maps can't be same
--HG--
branch : trunk
Diffstat (limited to 'src/game')
| -rw-r--r-- | src/game/Object.h | 4 |
1 files changed, 0 insertions, 4 deletions
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 |