about summary refs log tree commit diff
path: root/src/game/gamecore.cpp
diff options
context:
space:
mode:
authorDennis Felsing <dennis.felsing@sap.com>2017-06-22 09:47:18 +0200
committerDennis Felsing <dennis.felsing@sap.com>2017-06-22 09:47:18 +0200
commitfc6d8b4d154049e6e3d6df9039669580f8ff747c (patch)
tree5e64f811b7c3076126ea6772cbe3cc572b17b773 /src/game/gamecore.cpp
parentc1eed6e1776f48409e9d7372948e2c941dcad459 (diff)
downloadzcatch-fc6d8b4d154049e6e3d6df9039669580f8ff747c.tar.gz
zcatch-fc6d8b4d154049e6e3d6df9039669580f8ff747c.zip
Use round_to_int because of collision with std::round
Diffstat (limited to 'src/game/gamecore.cpp')
-rw-r--r--src/game/gamecore.cpp16
1 files changed, 8 insertions, 8 deletions
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;