Merge branch 'master' into 'master'

Fix console text bleeding

See merge request STJr/SRB2!1434
This commit is contained in:
sphere 2021-06-06 07:01:30 -04:00
commit c266a27073

View file

@ -1697,7 +1697,10 @@ static void CON_DrawHudlines(void)
{ {
charflags = (*p & 0x7f) << V_CHARCOLORSHIFT; charflags = (*p & 0x7f) << V_CHARCOLORSHIFT;
p++; p++;
c++;
} }
if (c >= con_width)
break;
if (*p < HU_FONTSTART) if (*p < HU_FONTSTART)
;//charwidth = 4 * con_scalefactor; ;//charwidth = 4 * con_scalefactor;
else else
@ -1818,7 +1821,10 @@ static void CON_DrawConsole(void)
{ {
charflags = (*p & 0x7f) << V_CHARCOLORSHIFT; charflags = (*p & 0x7f) << V_CHARCOLORSHIFT;
p++; p++;
c++;
} }
if (c >= con_width)
break;
V_DrawCharacter(x, y, (INT32)(*p) | charflags | cv_constextsize.value | V_NOSCALESTART, true); V_DrawCharacter(x, y, (INT32)(*p) | charflags | cv_constextsize.value | V_NOSCALESTART, true);
} }
} }