diff options
| author | megamage <none@none.none> | 2011-10-13 13:26:27 -0400 |
|---|---|---|
| committer | megamage <none@none.none> | 2011-10-13 13:26:27 -0400 |
| commit | 5912e2444de0b73b511ec073aa0cbd38b901295c (patch) | |
| tree | bc2caaf28328ba90868fade847f5dc3359072f2d /src/server/game/Entities/GameObject | |
| parent | dc2bdb8e13f5640840d5d87db7a83c16ee1ab79a (diff) | |
Some cleanup of CanSeeOrDetect code.
Diffstat (limited to 'src/server/game/Entities/GameObject')
| -rwxr-xr-x | src/server/game/Entities/GameObject/GameObject.cpp | 10 | ||||
| -rwxr-xr-x | src/server/game/Entities/GameObject/GameObject.h | 2 |
2 files changed, 6 insertions, 6 deletions
diff --git a/src/server/game/Entities/GameObject/GameObject.cpp b/src/server/game/Entities/GameObject/GameObject.cpp index 6e991bdc005..a0f35bf2ab4 100755 --- a/src/server/game/Entities/GameObject/GameObject.cpp +++ b/src/server/game/Entities/GameObject/GameObject.cpp @@ -854,16 +854,16 @@ bool GameObject::isAlwaysVisibleFor(WorldObject const* seer) const return false; } -bool GameObject::isVisibleForInState(WorldObject const* seer) const +bool GameObject::IsInvisibleDueToDespawn() const { - if (!WorldObject::isVisibleForInState(seer)) - return false; + if (WorldObject::IsInvisibleDueToDespawn()) + return true; // Despawned if (!isSpawned()) - return false; + return true; - return true; + return false; } void GameObject::Respawn() diff --git a/src/server/game/Entities/GameObject/GameObject.h b/src/server/game/Entities/GameObject/GameObject.h index 3402eaa64bc..459c526ee4d 100755 --- a/src/server/game/Entities/GameObject/GameObject.h +++ b/src/server/game/Entities/GameObject/GameObject.h @@ -753,7 +753,7 @@ class GameObject : public WorldObject, public GridObject<GameObject> void TriggeringLinkedGameObject(uint32 trapEntry, Unit* target); bool isAlwaysVisibleFor(WorldObject const* seer) const; - bool isVisibleForInState(WorldObject const* seer) const; + bool IsInvisibleDueToDespawn() const; uint8 getLevelForTarget(WorldObject const* target) const { |
