mirrors
/
OpenRCT2
mirror of https://github.com/OpenRCT2/OpenRCT2.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

Do not use float

This commit is contained in:
Ted John 2017-09-03 23:16:15 +01:00 committed by Marijn van der Werf
parent a8c9c758f4
commit a65192b141
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/openrct2/drawing/Text.cpp
View File

@ -23,8 +23,8 @@ extern "C"
static TextPaint _legacyPaint;
static void DrawText(rct_drawpixelinfo * dpi, float x, float y, TextPaint * paint, utf8string text);
static void DrawText(rct_drawpixelinfo * dpi, float x, float y, TextPaint * paint, rct_string_id format, void * args);
static void DrawText(rct_drawpixelinfo * dpi, sint32 x, sint32 y, TextPaint * paint, utf8string text);
static void DrawText(rct_drawpixelinfo * dpi, sint32 x, sint32 y, TextPaint * paint, rct_string_id format, void * args);
StaticLayout::StaticLayout(utf8string source, TextPaint paint, sint32 width)
{
@ -39,7 +39,7 @@ StaticLayout::StaticLayout(utf8string source, TextPaint paint, sint32 width)
_lineHeight = font_get_line_height(fontSpriteBase);
}
void StaticLayout::Draw(rct_drawpixelinfo *dpi, float x, float y)
void StaticLayout::Draw(rct_drawpixelinfo * dpi, sint32 x, sint32 y)
{
gCurrentFontFlags = 0;
gCurrentFontSpriteBase = _paint.SpriteBase;
@ -85,7 +85,7 @@ sint32 StaticLayout::GetLineCount()
return _lineCount;
}
static void DrawText(rct_drawpixelinfo * dpi, float x, float y, TextPaint * paint, utf8string text)
static void DrawText(rct_drawpixelinfo * dpi, sint32 x, sint32 y, TextPaint * paint, utf8string text)
{
sint32 width = gfx_get_string_width(text);
@ -112,7 +112,7 @@ static void DrawText(rct_drawpixelinfo * dpi, float x, float y, TextPaint * pain
}
}
static void DrawText(rct_drawpixelinfo * dpi, float x, float y, TextPaint * paint, rct_string_id format, void * args)
static void DrawText(rct_drawpixelinfo * dpi, sint32 x, sint32 y, TextPaint * paint, rct_string_id format, void * args)
{
utf8 buffer[256];
format_string(buffer, sizeof(buffer), format, args);

2
src/openrct2/drawing/Text.h
View File

@ -49,7 +49,7 @@ private:
public:
StaticLayout(utf8string source, TextPaint paint, sint32 width);
void Draw(rct_drawpixelinfo * dpi, float x, float y);
void Draw(rct_drawpixelinfo * dpi, sint32 x, sint32 y);
sint32 GetHeight();
sint32 GetWidth();
sint32 GetLineCount();