diff options
| author | degasus <wickmarkus@web.de> | 2012-12-25 12:39:00 +0100 |
|---|---|---|
| committer | degasus <wickmarkus@web.de> | 2012-12-25 12:39:00 +0100 |
| commit | bff0faea2d3afbd3fc9d19f9449f2c31d64a5e3e (patch) | |
| tree | 1b7262148633924c53e066a354c4b2a1a46d459d /Source/Plugins/Plugin_VideoSoftware/Src/SWRenderer.cpp | |
| parent | b3714f4874681b463c48f5aa96e3f89274f94aac (diff) | |
| parent | 399a6af66de69ffaf54d779441b57b05aa2b24e0 (diff) | |
Merge branch 'immediate-removal'
Conflicts:
Source/Plugins/Plugin_VideoOGL/Src/Render.cpp
Diffstat (limited to 'Source/Plugins/Plugin_VideoSoftware/Src/SWRenderer.cpp')
| -rw-r--r-- | Source/Plugins/Plugin_VideoSoftware/Src/SWRenderer.cpp | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/Source/Plugins/Plugin_VideoSoftware/Src/SWRenderer.cpp b/Source/Plugins/Plugin_VideoSoftware/Src/SWRenderer.cpp index 3923ed0840..0fefa16a93 100644 --- a/Source/Plugins/Plugin_VideoSoftware/Src/SWRenderer.cpp +++ b/Source/Plugins/Plugin_VideoSoftware/Src/SWRenderer.cpp @@ -101,12 +101,11 @@ void SWRenderer::RenderText(const char* pstr, int left, int top, u32 color) { int nBackbufferWidth = (int)OpenGL_GetBackbufferWidth(); int nBackbufferHeight = (int)OpenGL_GetBackbufferHeight(); - glColor4f(((color>>16) & 0xff)/255.0f, ((color>> 8) & 0xff)/255.0f, - ((color>> 0) & 0xff)/255.0f, ((color>>24) & 0xFF)/255.0f); + s_pfont->printMultilineText(pstr, left * 2.0f / (float)nBackbufferWidth - 1, 1 - top * 2.0f / (float)nBackbufferHeight, - 0, nBackbufferWidth, nBackbufferHeight); + 0, nBackbufferWidth, nBackbufferHeight, color); } void SWRenderer::DrawDebugText() |