OrdinaryMagician/vkdoom_m
OrdinaryMagician/vkdoom_m
1
Fork 0
Code Activity

- use a saner data structure to store the BrokenLines.

Browse source 
Calling the old method with a pointer to an array of unspecified length 'dirty' would be an understatement.
Now it uses a TArray to store the single elements
This commit is contained in:
Christoph Oelckers 2018-10-31 19:13:54 +01:00
commit 0d54d335c4
15 changed files with 62 additions and 135 deletions
Download patch file Download diff file Expand all files Collapse all files

23
src/c_console.cpp
View file

@ -732,8 +732,8 @@ void FNotifyBuffer::Shift(int maxlines)
void FNotifyBuffer::AddString(int printlevel, FString source)
{
FBrokenLines *lines;
int i, width;
TArray<FBrokenLines> lines;
int width;
if ((printlevel != 128 && !show_messages) ||
source.IsEmpty() ||
@ -764,14 +764,14 @@ void FNotifyBuffer::AddString(int printlevel, FString source)
}
}
if (lines == NULL)
if (lines.Size() == 0)
return;
for (i = 0; lines[i].Width >= 0; i++)
for (auto &line : lines)
{
FNotifyText newline;
newline.Text = lines[i].Text;
newline.Text = line.Text;
newline.TimeOut = gametic + int(con_notifytime * TICRATE);
newline.PrintLevel = printlevel;
if (AddType == NEWLINE || Text.Size() == 0)
@ -789,9 +789,6 @@ void FNotifyBuffer::AddString(int printlevel, FString source)
AddType = NEWLINE;
}
V_FreeBrokenLines (lines);
lines = NULL;
switch (source[source.Len()-1])
{
case '\r': AddType = REPLACELINE; break;
@ -1185,22 +1182,22 @@ void C_DrawConsole ()
// No more enqueuing because adding new text to the console won't touch the actual print data.
conbuffer->FormatText(ConFont, ConWidth / textScale);
unsigned int consolelines = conbuffer->GetFormattedLineCount();
FBrokenLines **blines = conbuffer->GetLines();
FBrokenLines **printline = blines + consolelines - 1 - RowAdjust;
FBrokenLines *blines = conbuffer->GetLines();
FBrokenLines *printline = blines + consolelines - 1 - RowAdjust;
int bottomline = ConBottom / textScale - ConFont->GetHeight()*2 - 4;
ConsoleDrawing = true;
for(FBrokenLines **p = printline; p >= blines && lines > 0; p--, lines--)
for(FBrokenLines *p = printline; p >= blines && lines > 0; p--, lines--)
{
if (textScale == 1)
{
screen->DrawText(ConFont, CR_TAN, LEFTMARGIN, offset + lines * ConFont->GetHeight(), (*p)->Text, TAG_DONE);
screen->DrawText(ConFont, CR_TAN, LEFTMARGIN, offset + lines * ConFont->GetHeight(), p->Text, TAG_DONE);
}
else
{
screen->DrawText(ConFont, CR_TAN, LEFTMARGIN, offset + lines * ConFont->GetHeight(), (*p)->Text,
screen->DrawText(ConFont, CR_TAN, LEFTMARGIN, offset + lines * ConFont->GetHeight(), p->Text,
DTA_VirtualWidth, screen->GetWidth() / textScale,
DTA_VirtualHeight, screen->GetHeight() / textScale,
DTA_KeepRatio, true, TAG_DONE);