Merge remote-tracking branch 'gzdoom/master'

This commit is contained in:
Rachael Alexanderson 2017-02-05 16:07:48 -05:00
commit 942f90a759
24 changed files with 528 additions and 151 deletions

View file

@ -1756,11 +1756,10 @@ void C_MidPrintBold (FFont *font, const char *msg)
DEFINE_ACTION_FUNCTION(_Console, MidPrint)
{
PARAM_PROLOGUE;
PARAM_STRING(font);
PARAM_POINTER_NOT_NULL(fnt, FFont);
PARAM_STRING(text);
PARAM_BOOL_DEF(bold);
FFont *fnt = FFont::FindFont(font);
const char *txt = text[0] == '$'? GStrings(&text[1]) : text.GetChars();
if (!bold) C_MidPrint(fnt, txt);
else C_MidPrintBold(fnt, txt);