diff options
author | panaut0lordv <panaut0lordv@gmail.com> | 2009-03-10 23:10:08 +0100 |
---|---|---|
committer | panaut0lordv <panaut0lordv@gmail.com> | 2009-03-10 23:10:08 +0100 |
commit | 6e38f12f3e96de6027363c098c139a1bdaf316e6 (patch) | |
tree | bb7751b0e171df4e17282347a01450665d9ae69a /src/game/GameObject.cpp | |
parent | 95ce2042db289db68bc74e6e5b0b2b558ea521e5 (diff) | |
parent | dc4a456416870697d1bf727ab5c7b9f6cf3537f0 (diff) |
Merge.
--HG--
branch : trunk
Diffstat (limited to 'src/game/GameObject.cpp')
-rw-r--r-- | src/game/GameObject.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/game/GameObject.cpp b/src/game/GameObject.cpp index 8f620638b01..f967bb50dfc 100644 --- a/src/game/GameObject.cpp +++ b/src/game/GameObject.cpp @@ -754,7 +754,7 @@ bool GameObject::isVisibleForInState(Player const* u, bool inVisibleList) const } // check distance - return IsWithinDistInMap(u,World::GetMaxVisibleDistanceForObject() + + return IsWithinDistInMap(u->m_seer,World::GetMaxVisibleDistanceForObject() + (inVisibleList ? World::GetVisibleObjectGreyDistance() : 0.0f), false); } |