From abc84ac0b0ff77b3b30a20252f86332c699e4466 Mon Sep 17 00:00:00 2001 From: oy Date: Mon, 16 Aug 2010 02:21:18 +0200 Subject: added fixes for compiler errors and warnings by sworddragon --- src/game/client/components/chat.cpp | 4 ++-- src/game/server/gamecontroller.cpp | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) (limited to 'src/game') diff --git a/src/game/client/components/chat.cpp b/src/game/client/components/chat.cpp index 898cd30f..7b64aac7 100644 --- a/src/game/client/components/chat.cpp +++ b/src/game/client/components/chat.cpp @@ -203,7 +203,7 @@ void CChat::OnRender() TextRender()->TextEx(&Cursor, m_Input.GetString()+m_Input.GetCursorOffset(), -1); } - y -= 8; + y -= 8.0f; int i; int64 Now = time_get(); @@ -225,7 +225,7 @@ void CChat::OnRender() y -= Cursor.m_Y + Cursor.m_FontSize; // cut off if msgs waste too much space - int HeightLimit = m_Show ? 0.0f : 200.0f; + float HeightLimit = m_Show ? 0.0f : 200.0f; if(y < HeightLimit) break; diff --git a/src/game/server/gamecontroller.cpp b/src/game/server/gamecontroller.cpp index 07f8bf86..04eb8c6e 100644 --- a/src/game/server/gamecontroller.cpp +++ b/src/game/server/gamecontroller.cpp @@ -423,7 +423,7 @@ void IGameController::Tick() do { CPlayer *pP = 0; - int PD = aTScore[M]; + float PD = aTScore[M]; for(int i = 0; i < MAX_CLIENTS; i++) { if(!GameServer()->m_apPlayers[i] || !CanBeMovedOnBalance(i)) -- cgit 1.4.1