sync with upstream

This commit is contained in:
Nikolay Korolev
2020-12-08 12:00:24 +03:00
22 changed files with 73157 additions and 180 deletions

View File

@ -374,7 +374,11 @@ CFont::PrintChar(float x, float y, wchar c)
if(Details.style == FONT_BANK || Details.style == FONT_STANDARD){
if (bDontPrint) return;
if (RenderState.slant == 0.0f) {
#ifdef FIX_BUGS
if (c < 192) {
#else
if (c < 193) {
#endif
CSprite2d::AddToBuffer(
CRect(x, y,
x + 32.0f * RenderState.scaleX * 1.0f,
@ -390,9 +394,9 @@ CFont::PrintChar(float x, float y, wchar c)
x + 32.0f * RenderState.scaleX * 1.0f,
y + 33.0f * RenderState.scaleY * 0.5f),
RenderState.color,
xoff / 16.0f, yoff / 12.8f,
(xoff + 1.0f) / 16.0f - 0.001f, yoff / 12.8f - 0.017f,
xoff / 16.0f, (yoff + 1.0f) / 12.8f,
xoff / 16.0f, yoff / 12.8f + 0.0021f,
(xoff + 1.0f) / 16.0f - 0.001f, yoff / 12.8f + 0.0021f,
xoff / 16.0f, (yoff + 1.0f) / 12.8f - 0.017f,
(xoff + 1.0f) / 16.0f - 0.001f, (yoff + 1.0f) / 12.8f - 0.017f);
}
} else