zdoom/qzdoom
0
0
Fork 0
mirror of https://github.com/ZDoom/qzdoom.git synced 2024-12-01 08:31:45 +00:00
Code Issues Projects Releases Packages Wiki Activity

- made console notification scrolling independent of the global game ticker variable.

Browse source
This commit is contained in:
Christoph Oelckers 2020-04-11 18:07:33 +02:00
parent d7a9bdc858
commit 5dd89541fe
1 changed files with 13 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
src/console/c_console.cpp
View file

@ -514,6 +514,7 @@ static int HistSize;
struct FNotifyText
{
int TimeOut;
int Ticker;
int PrintLevel;
FString Text;
};
@ -819,7 +820,8 @@ void FNotifyBuffer::AddString(int printlevel, FString source)
FNotifyText newline;
newline.Text = line.Text;
newline.TimeOut = gametic + int(con_notifytime * TICRATE);
newline.TimeOut = int(con_notifytime * GameTicRate);
newline.Ticker = 0;
newline.PrintLevel = printlevel;
if (AddType == NEWLINE || Text.Size() == 0)
{
@ -1057,12 +1059,19 @@ void FNotifyBuffer::Tick()
unsigned i;
for (i = 0; i < Text.Size(); ++i)
{
if (Text[i].TimeOut != 0 && Text[i].TimeOut > gametic)
Text[i].Ticker++;
}
for (i = 0; i < Text.Size(); ++i)
{
if (Text[i].TimeOut != 0 && Text[i].TimeOut > Text[i].Ticker)
break;
}
if (i > 0)
{
Text.Delete(0, i);
FFont* font = generic_ui ? NewSmallFont : AlternativeSmallFont;
Top += font->GetHeight();
}
}
@ -1072,7 +1081,7 @@ void FNotifyBuffer::Draw()
int line, lineadv, color, j;
bool canskip;
if (gamestate == GS_FULLCONSOLE || gamestate == GS_DEMOSCREEN/* || menuactive != MENU_Off*/)
if (gamestate == GS_FULLCONSOLE || gamestate == GS_DEMOSCREEN)
return;
FFont* font = generic_ui ? NewSmallFont : AlternativeSmallFont;
@ -1089,7 +1098,7 @@ void FNotifyBuffer::Draw()
if (notify.TimeOut == 0)
continue;
j = notify.TimeOut - gametic;
j = notify.TimeOut - notify.Ticker;
if (j > 0)
{
if (!show_messages && notify.PrintLevel != 128)
@ -1122,11 +1131,6 @@ void FNotifyBuffer::Draw()
}
else
{
if (canskip)
{
Top += lineadv;
line += lineadv;
}
notify.TimeOut = 0;
}
}