zdoom/gzdoom-gles
0
0
Fork 0
mirror of https://github.com/ZDoom/gzdoom-gles.git synced 2025-01-31 12:30:32 +00:00
Code Issues Projects Releases Packages Wiki Activity

- fixed: subtitles background renains visible on new game

Browse source 
https://forum.zdoom.org/viewtopic.php?t=65366

# Conflicts:
#	src/g_statusbar/shared_sbar.cpp
This commit is contained in:
alexey.lysiuk 2019-07-16 11:37:41 +03:00 committed by drfrag
parent fd3c760244
commit 2b3d0467e7
1 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/g_statusbar/shared_sbar.cpp
View file

@ -1088,8 +1088,9 @@ void DBaseStatusBar::CallDraw(EHudState state, double ticFrac)
void DBaseStatusBar::DrawLog ()
{
int hudwidth, hudheight;
const FString & text = (inter_subtitles && CPlayer->SubtitleCounter) ? CPlayer->SubtitleText : CPlayer->LogText;
if (CPlayer->LogText.IsNotEmpty())
if (text.IsNotEmpty())
{
// This uses the same scaling as regular HUD messages
auto scale = active_con_scaletext();
@ -1097,7 +1098,6 @@ void DBaseStatusBar::DrawLog ()
hudheight = SCREENHEIGHT / scale;
int linelen = hudwidth<640? Scale(hudwidth,9,10)-40 : 560;
const FString & text = (inter_subtitles && CPlayer->SubtitleCounter) ? CPlayer->SubtitleText : CPlayer->LogText;
auto lines = V_BreakLines (SmallFont, linelen, text[0] == '$'? GStrings(text.GetChars()+1) : text.GetChars());
int height = 20;