summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorSergeanur <s.anureev@yandex.ua>2019-10-03 23:49:11 +0200
committerSergeanur <s.anureev@yandex.ua>2019-10-03 23:49:11 +0200
commit5e1538a2757dc495d0c15f72a71583b4b8f2610d (patch)
treedc2490e7fd6dc7123991840401048c06da6cd3ec /src
parentMerge pull request #221 from Sergeanur/FixFormat (diff)
downloadre3-5e1538a2757dc495d0c15f72a71583b4b8f2610d.tar
re3-5e1538a2757dc495d0c15f72a71583b4b8f2610d.tar.gz
re3-5e1538a2757dc495d0c15f72a71583b4b8f2610d.tar.bz2
re3-5e1538a2757dc495d0c15f72a71583b4b8f2610d.tar.lz
re3-5e1538a2757dc495d0c15f72a71583b4b8f2610d.tar.xz
re3-5e1538a2757dc495d0c15f72a71583b4b8f2610d.tar.zst
re3-5e1538a2757dc495d0c15f72a71583b4b8f2610d.zip
Diffstat (limited to '')
-rw-r--r--src/render/Hud.cpp30
1 files changed, 13 insertions, 17 deletions
diff --git a/src/render/Hud.cpp b/src/render/Hud.cpp
index 2dae7551..ae0d4eb3 100644
--- a/src/render/Hud.cpp
+++ b/src/render/Hud.cpp
@@ -336,23 +336,6 @@ void CHud::Draw()
AsciiToUnicode(sTemp, sPrint);
- CFont::SetBackgroundOff();
- CFont::SetScale(SCREEN_SCALE_X(0.4f), SCREEN_SCALE_Y(0.6f));
- CFont::SetJustifyOff();
- CFont::SetCentreOn();
- CFont::SetCentreSize(SCREEN_SCALE_X(640.0f));
- CFont::SetPropOn();
- CFont::SetFontStyle(FONT_BANK);
-
- if (!CDarkel::FrenzyOnGoing()) {
- if (WeaponType) {
- if (WeaponType != WEAPONTYPE_BASEBALLBAT) {
- CFont::SetColor(CRGBA(0, 0, 0, 255));
- CFont::PrintString(SCREEN_SCALE_FROM_RIGHT(66.0f), SCREEN_SCALE_Y(73.0f), sPrint);
- }
- }
- }
-
/*
DrawWeaponIcon
*/
@@ -368,6 +351,19 @@ void CHud::Draw()
1.0f,
1.0f);
+ CFont::SetBackgroundOff();
+ CFont::SetScale(SCREEN_SCALE_X(0.4f), SCREEN_SCALE_Y(0.6f));
+ CFont::SetJustifyOff();
+ CFont::SetCentreOn();
+ CFont::SetCentreSize(SCREEN_SCALE_X(640.0f));
+ CFont::SetPropOn();
+ CFont::SetFontStyle(FONT_BANK);
+
+ if (!CDarkel::FrenzyOnGoing() && WeaponType != WEAPONTYPE_UNARMED && WeaponType != WEAPONTYPE_BASEBALLBAT) {
+ CFont::SetColor(CRGBA(0, 0, 0, 255));
+ CFont::PrintString(SCREEN_SCALE_FROM_RIGHT(66.0f), SCREEN_SCALE_Y(73.0f), sPrint);
+ }
+
/*
DrawHealth
*/