mirrors
/
re3
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

fixes

This commit is contained in:
Sergeanur 2020-06-07 04:20:02 +03:00
parent 24bf4c2cba
commit fc7e35e1cd
3 changed files with 5 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/render/Font.cpp
View File

@ -328,7 +328,7 @@ CFont::PrintChar(float x, float y, wchar c)
}
#endif
if(Details.style == FONT_STANDART || Details.style == FONT_HEADING){
if(Details.style == FONT_BANK || Details.style == FONT_HEADING){
if (bDontPrint) return;
CSprite2d::AddToBuffer(
CRect(x, y,
@ -818,11 +818,7 @@ CFont::PrintString(float x, float y, wchar *start, wchar *end, float spwidth)
if (v7 != 0.0f && (CFont::Details.style == 0 || CFont::Details.style == 1))
{
auto v8 = CFont::Details.color;
CFont::Details.color.r = CFont::Details.dropColor.r;
//v18 = v8;
CFont::Details.color.g = CFont::Details.dropColor.g;
CFont::Details.color.b = CFont::Details.dropColor.b;
CFont::Details.color.a = CFont::Details.dropColor.a;
CFont::Details.color = CFont::Details.dropColor;
CFont::Details.dropShadowPosition = 0;
CFont::Details.bIsShadow = true;
if (0.0f != CFont::Details.slant)
@ -1244,7 +1240,7 @@ CFont::SetFontStyle(int16 style)
{
if (style == FONT_HEADING)
{
Details.style = FONT_BANK;
Details.style = FONT_STANDARD;
Details.bFontHalfTexture = true;
}
else

2
src/render/Font.h
View File

@ -56,8 +56,8 @@ struct CFontRenderState
class CSprite2d;
enum {
FONT_STANDART,
FONT_BANK,
FONT_STANDARD,
FONT_HEADING,
#ifdef MORE_LANGUAGES
FONT_JAPANESE,

2
src/render/Hud.cpp
View File

@ -904,7 +904,7 @@ void CHud::Draw()
CFont::SetCentreOff();
CFont::SetJustifyOff();
CFont::SetPropOff();
CFont::SetFontStyle(FONT_PAGER);
CFont::SetFontStyle(FONT_STANDARD);
CFont::PrintString(SCREEN_SCALE_X(52.0f - PagerXOffset), SCREEN_SCALE_Y(54.0f), m_PagerMessage);
}