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/collision.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'src/game/collision.h') diff --git a/src/game/collision.h b/src/game/collision.h index d16f2d56..cad75bb4 100644 --- a/src/game/collision.h +++ b/src/game/collision.h @@ -25,9 +25,9 @@ public: CCollision(); void Init(class CLayers *pLayers); - bool CheckPoint(float x, float y) { return IsTileSolid(round(x), round(y)); } + bool CheckPoint(float x, float y) { return IsTileSolid(round_to_int(x), round_to_int(y)); } bool CheckPoint(vec2 Pos) { return CheckPoint(Pos.x, Pos.y); } - int GetCollisionAt(float x, float y) { return GetTile(round(x), round(y)); } + int GetCollisionAt(float x, float y) { return GetTile(round_to_int(x), round_to_int(y)); } int GetWidth() { return m_Width; }; int GetHeight() { return m_Height; }; int IntersectLine(vec2 Pos0, vec2 Pos1, vec2 *pOutCollision, vec2 *pOutBeforeCollision); -- cgit 1.4.1