diff options
| author | megamage <none@none> | 2009-02-04 10:53:58 -0600 |
|---|---|---|
| committer | megamage <none@none> | 2009-02-04 10:53:58 -0600 |
| commit | df7499e0565116c356308839079c36943ba7949c (patch) | |
| tree | 5c7b362962dc49e95601eea5ccfe5102b370639d /src/game/DynamicObject.cpp | |
| parent | 50c82c666093b5dac3cd60cddf9f46223a48d8d9 (diff) | |
| parent | 6b19b789ca1757b99a5eaf37fba7c3f555347ab1 (diff) | |
*Merge.
--HG--
branch : trunk
Diffstat (limited to 'src/game/DynamicObject.cpp')
| -rw-r--r-- | src/game/DynamicObject.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/game/DynamicObject.cpp b/src/game/DynamicObject.cpp index 90f87ad20a3..4b452cd4b76 100644 --- a/src/game/DynamicObject.cpp +++ b/src/game/DynamicObject.cpp @@ -156,7 +156,7 @@ void DynamicObject::Delay(int32 delaytime) bool DynamicObject::isVisibleForInState(Player const* u, bool inVisibleList) const { - return IsInWorld() && u->IsInWorld() + return IsInWorld() && u->IsInWorld() && (IsWithinDistInMap(u,World::GetMaxVisibleDistanceForObject()+(inVisibleList ? World::GetVisibleObjectGreyDistance() : 0.0f), false) || GetCasterGUID() == u->GetGUID()); } |