josh/TCPlayerbotCore
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

restore work of IsInMap check

Browse Source 
--HG--
branch : trunk
This commit is contained in:
silverice
2010-03-22 18:46:48 +02:00
parent 4478ccf6c4
commit d4c3620557
1 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/game/Object.h
+3 -2
View File
@@ -560,9 +560,10 @@ class WorldObject : public Object, public WorldLocation
bool IsInMap(const WorldObject* obj) const bool IsInMap(const WorldObject* obj) const
{ {
if (!obj || !IsInWorld() || !(obj->IsInWorld()) || GetMap() != obj->GetMap() || !InSamePhase(obj)) if (obj)
return IsInWorld() && obj->IsInWorld() && (GetMap() == obj->GetMap()) && InSamePhase(obj);
else
return false; return false;
return true;
} }
bool IsWithinDist3d(float x, float y, float z, float dist) const bool IsWithinDist3d(float x, float y, float z, float dist) const
{ return IsInDist(x, y, z, dist + GetObjectSize()); } { return IsInDist(x, y, z, dist + GetObjectSize()); }