Fixed merge

This commit is contained in:
tomrus88 2008-12-05 18:38:17 +03:00
parent af1e1d7794
commit 588edbcedb
4 changed files with 7 additions and 63 deletions

View file

@ -738,7 +738,7 @@ bool GameObject::isVisibleForInState(Player const* u, bool inVisibleList) const
}
// check distance
return IsWithinDistInMap2d(u,World::GetMaxVisibleDistanceForObject() +
return IsWithinDistInMap(u,World::GetMaxVisibleDistanceForObject() +
(inVisibleList ? World::GetVisibleObjectGreyDistance() : 0.0f), false);
}