mirror/re3
1
0
Fork 0
mirror of https://github.com/GTAmodding/re3.git synced 2024-12-27 11:25:41 +00:00
Code Issues Projects Releases Wiki Activity

fixes

Browse source
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 #endif
if(Details.style == FONT_STANDART || Details.style == FONT_HEADING){ if(Details.style == FONT_BANK || Details.style == FONT_HEADING){
if (bDontPrint) return; if (bDontPrint) return;
CSprite2d::AddToBuffer( CSprite2d::AddToBuffer(
CRect(x, y, 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)) if (v7 != 0.0f && (CFont::Details.style == 0 || CFont::Details.style == 1))
{ {
auto v8 = CFont::Details.color; auto v8 = CFont::Details.color;
CFont::Details.color.r = CFont::Details.dropColor.r; CFont::Details.color = CFont::Details.dropColor;
//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.dropShadowPosition = 0; CFont::Details.dropShadowPosition = 0;
CFont::Details.bIsShadow = true; CFont::Details.bIsShadow = true;
if (0.0f != CFont::Details.slant) if (0.0f != CFont::Details.slant)
@ -1244,7 +1240,7 @@ CFont::SetFontStyle(int16 style)
{ {
if (style == FONT_HEADING) if (style == FONT_HEADING)
{ {
Details.style = FONT_BANK; Details.style = FONT_STANDARD;
Details.bFontHalfTexture = true; Details.bFontHalfTexture = true;
} }
else else

2
src/render/Font.h
View file

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

2
src/render/Hud.cpp
View file

@ -904,7 +904,7 @@ void CHud::Draw()
CFont::SetCentreOff(); CFont::SetCentreOff();
CFont::SetJustifyOff(); CFont::SetJustifyOff();
CFont::SetPropOff(); 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); CFont::PrintString(SCREEN_SCALE_X(52.0f - PagerXOffset), SCREEN_SCALE_Y(54.0f), m_PagerMessage);
} }