From fc6d8b4d154049e6e3d6df9039669580f8ff747c Mon Sep 17 00:00:00 2001 From: Dennis Felsing Date: Thu, 22 Jun 2017 09:47:18 +0200 Subject: Use round_to_int because of collision with std::round --- src/game/server/entity.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'src/game/server') diff --git a/src/game/server/entity.cpp b/src/game/server/entity.cpp index 7c2a97e8..5d86adaf 100644 --- a/src/game/server/entity.cpp +++ b/src/game/server/entity.cpp @@ -51,8 +51,8 @@ int CEntity::NetworkClipped(int SnappingClient, vec2 CheckPos) bool CEntity::GameLayerClipped(vec2 CheckPos) { - return round(CheckPos.x)/32 < -200 || round(CheckPos.x)/32 > GameServer()->Collision()->GetWidth()+200 || - round(CheckPos.y)/32 < -200 || round(CheckPos.y)/32 > GameServer()->Collision()->GetHeight()+200 ? true : false; + return round_to_int(CheckPos.x)/32 < -200 || round_to_int(CheckPos.x)/32 > GameServer()->Collision()->GetWidth()+200 || + round_to_int(CheckPos.y)/32 < -200 || round_to_int(CheckPos.y)/32 > GameServer()->Collision()->GetHeight()+200 ? true : false; } void CEntity::InitAffectedCharacters() -- cgit 1.4.1