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 ++-- src/game/gamecore.cpp | 16 ++++++++-------- src/game/server/entity.cpp | 4 ++-- 3 files changed, 12 insertions(+), 12 deletions(-) (limited to 'src/game') 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); diff --git a/src/game/gamecore.cpp b/src/game/gamecore.cpp index d43492ac..a325a53e 100644 --- a/src/game/gamecore.cpp +++ b/src/game/gamecore.cpp @@ -401,17 +401,17 @@ void CCharacterCore::Move() void CCharacterCore::Write(CNetObj_CharacterCore *pObjCore) { - pObjCore->m_X = round(m_Pos.x); - pObjCore->m_Y = round(m_Pos.y); + pObjCore->m_X = round_to_int(m_Pos.x); + pObjCore->m_Y = round_to_int(m_Pos.y); - pObjCore->m_VelX = round(m_Vel.x*256.0f); - pObjCore->m_VelY = round(m_Vel.y*256.0f); + pObjCore->m_VelX = round_to_int(m_Vel.x*256.0f); + pObjCore->m_VelY = round_to_int(m_Vel.y*256.0f); pObjCore->m_HookState = m_HookState; pObjCore->m_HookTick = m_HookTick; - pObjCore->m_HookX = round(m_HookPos.x); - pObjCore->m_HookY = round(m_HookPos.y); - pObjCore->m_HookDx = round(m_HookDir.x*256.0f); - pObjCore->m_HookDy = round(m_HookDir.y*256.0f); + pObjCore->m_HookX = round_to_int(m_HookPos.x); + pObjCore->m_HookY = round_to_int(m_HookPos.y); + pObjCore->m_HookDx = round_to_int(m_HookDir.x*256.0f); + pObjCore->m_HookDy = round_to_int(m_HookDir.y*256.0f); pObjCore->m_HookedPlayer = m_HookedPlayer; pObjCore->m_Jumped = m_Jumped; pObjCore->m_Direction = m_Direction; 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