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/engine/client/text.cpp | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'src/engine/client/text.cpp') diff --git a/src/engine/client/text.cpp b/src/engine/client/text.cpp index 672fde60..ef741c12 100644 --- a/src/engine/client/text.cpp +++ b/src/engine/client/text.cpp @@ -509,7 +509,7 @@ public: return Cursor.m_X; } - virtual float TextLineCount(void *pFontSetV, float Size, const char *pText, int LineWidth) + virtual int TextLineCount(void *pFontSetV, float Size, const char *pText, float LineWidth) { CTextCursor Cursor; SetCursor(&Cursor, 0, 0, Size, 0); @@ -551,14 +551,14 @@ public: FakeToScreenX = (Graphics()->ScreenWidth()/(ScreenX1-ScreenX0)); FakeToScreenY = (Graphics()->ScreenHeight()/(ScreenY1-ScreenY0)); - ActualX = pCursor->m_X * FakeToScreenX; - ActualY = pCursor->m_Y * FakeToScreenY; + ActualX = (int)(pCursor->m_X * FakeToScreenX); + ActualY = (int)(pCursor->m_Y * FakeToScreenY); CursorX = ActualX / FakeToScreenX; CursorY = ActualY / FakeToScreenY; // same with size - ActualSize = Size * FakeToScreenY; + ActualSize = (int)(Size * FakeToScreenY); Size = ActualSize / FakeToScreenY; // fetch pFont data -- cgit 1.4.1