From fc7e35e1cde94938f72a89c33907668fad0c80d3 Mon Sep 17 00:00:00 2001
From: Sergeanur <s.anureev@yandex.ua>
Date: Sun, 7 Jun 2020 04:20:02 +0300
Subject: [PATCH] fixes

---
 src/render/Font.cpp | 10 +++-------
 src/render/Font.h   |  2 +-
 src/render/Hud.cpp  |  2 +-
 3 files changed, 5 insertions(+), 9 deletions(-)

diff --git a/src/render/Font.cpp b/src/render/Font.cpp
index 781604e1..9b478e90 100644
--- a/src/render/Font.cpp
+++ b/src/render/Font.cpp
@@ -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
diff --git a/src/render/Font.h b/src/render/Font.h
index 7b7b91e5..e08d800c 100644
--- a/src/render/Font.h
+++ b/src/render/Font.h
@@ -56,8 +56,8 @@ struct CFontRenderState
 class CSprite2d;
 
 enum {
-	FONT_STANDART,
 	FONT_BANK,
+	FONT_STANDARD,
 	FONT_HEADING,
 #ifdef MORE_LANGUAGES
 	FONT_JAPANESE,
diff --git a/src/render/Hud.cpp b/src/render/Hud.cpp
index dc425a15..5b31bbdc 100644
--- a/src/render/Hud.cpp
+++ b/src/render/Hud.cpp
@@ -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);
 		}