archivemirrors/re3
1
0
Fork 0
mirror of https://github.com/halpz/re3.git synced 2025-07-23 02:49:45 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'upstream/master'

Browse Source
This commit is contained in:
Nikolay Korolev
2020-04-18 23:50:58 +03:00
parent c4cd45d47c 9bfcaff849
commit 4c133a95bd
7 changed files with 46 additions and 19 deletions

9
src/render/Hud.cpp

@ -473,7 +473,12 @@ void CHud::Draw()
break;
}
#ifndef HUD_ENHANCEMENTS
if (!m_Message[0]) {
#else
if (!m_Message[0] && !m_BigMessage[2][0]) { // Hide zone name if wasted/busted text is displaying
#endif
m_ZoneNameTimer += CTimer::GetTimeStepInMilliseconds();
CFont::SetJustifyOff();
CFont::SetPropOn();
@ -563,7 +568,11 @@ void CHud::Draw()
break;
}
#ifndef HUD_ENHANCEMENTS
if (!m_Message[0]) {
#else
if (!m_Message[0] && !m_BigMessage[2][0]) { // Hide vehicle name if wasted/busted text is displaying
#endif
m_VehicleNameTimer += CTimer::GetTimeStepInMilliseconds();
CFont::SetJustifyOff();
CFont::SetPropOn();