diff options
| author | erorcun <erorcunerorcun@hotmail.com.tr> | 2020-10-20 21:19:05 +0200 |
|---|---|---|
| committer | erorcun <erorcunerorcun@hotmail.com.tr> | 2020-10-20 21:19:05 +0200 |
| commit | 42fbe7572ef51d37f8a4107d2294c81a0b8f79c2 (patch) | |
| tree | 2e6af9001bbedd5204f2627aa88762cc596561b5 /src/render/Font.cpp | |
| parent | fix (diff) | |
| download | re3-42fbe7572ef51d37f8a4107d2294c81a0b8f79c2.tar re3-42fbe7572ef51d37f8a4107d2294c81a0b8f79c2.tar.gz re3-42fbe7572ef51d37f8a4107d2294c81a0b8f79c2.tar.bz2 re3-42fbe7572ef51d37f8a4107d2294c81a0b8f79c2.tar.lz re3-42fbe7572ef51d37f8a4107d2294c81a0b8f79c2.tar.xz re3-42fbe7572ef51d37f8a4107d2294c81a0b8f79c2.tar.zst re3-42fbe7572ef51d37f8a4107d2294c81a0b8f79c2.zip | |
Diffstat (limited to 'src/render/Font.cpp')
| -rw-r--r-- | src/render/Font.cpp | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/src/render/Font.cpp b/src/render/Font.cpp index f14e45cd..b6ae601f 100644 --- a/src/render/Font.cpp +++ b/src/render/Font.cpp @@ -468,17 +468,21 @@ bool CFont::IsAnsiCharacter(wchar *s) void CFont::PrintString(float xstart, float ystart, wchar *s) { - CRect rect; + CRect rect(1000000.0f, -1000000.0f, 1000000.0f, -1000000.0f); int numSpaces; float lineLength; float x, y; bool first; wchar *start, *t; + Details.bFlash = false; + if(*s == '*') return; + Details.anonymous_25++; if(Details.background){ + RenderState.color = Details.color; GetNumberLines(xstart, ystart, s); // BUG: result not used GetTextRect(&rect, xstart, ystart, s); CSprite2d::DrawRect(rect, Details.backgroundColor); @@ -1292,6 +1296,7 @@ CFont::RenderFontBuffer() RenderState = *(CFontRenderState*)&FontRenderStateBuf[0]; textPosX = RenderState.fTextPosX; textPosY = RenderState.fTextPosY; + color = RenderState.color; tFontRenderStatePointer pRenderStateBufPointer; pRenderStateBufPointer.pRenderState = (CFontRenderState*)&FontRenderStateBuf[0]; for (++pRenderStateBufPointer.pRenderState; pRenderStateBufPointer.pStr < FontRenderStatePointer.pStr; pRenderStateBufPointer.pStr++) { |