araxiaonline/TrinityCore2
3
0
Fork 0
mirror of https://github.com/araxiaonline/TrinityCore2.git synced 2026-06-19 14:29:33 -04:00
Code Issues Packages Projects Releases Wiki Activity

Some cleanup of CanSeeOrDetect code.

Browse Source
This commit is contained in:
megamage
2011-10-13 13:26:27 -04:00
parent dc2bdb8e13
commit 5912e2444d
10 changed files with 25 additions and 42 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/server/game/Entities/Object/Object.cpp
+2 -10
View File
@@ -1587,14 +1587,6 @@ bool Position::IsPositionValid() const
return Trinity::IsValidMapCoord(m_positionX, m_positionY, m_positionZ, m_orientation);
}
bool WorldObject::isValid() const
{
if (!IsInWorld())
return false;
return true;
}
float WorldObject::GetGridActivationRange() const
{
if (ToPlayer())
@@ -1638,7 +1630,7 @@ bool WorldObject::canSeeOrDetect(WorldObject const* obj, bool ignoreStealth, boo
if (this == obj)
return true;
if (!obj->isValid())
if (obj->IsNeverVisible())
return false;
if (GetMap() != obj->GetMap())
@@ -1704,7 +1696,7 @@ bool WorldObject::canSeeOrDetect(WorldObject const* obj, bool ignoreStealth, boo
return false;
}
if (!obj->isVisibleForInState(this))
if (obj->IsInvisibleDueToDespawn())
return false;
if (!canDetect(obj, ignoreStealth))