Merge branch 'wordwrapfix' into 'master'

Fix V_WordWrap and the new additional text colour codes.

See merge request STJr/SRB2Internal!612
This commit is contained in:
MascaraSnake 2019-12-05 16:32:30 -05:00
commit 6393542dc3

View file

@ -2084,7 +2084,7 @@ char *V_WordWrap(INT32 x, INT32 w, INT32 option, const char *string)
for (i = 0; i < slen; ++i)
{
c = newstring[i];
if ((UINT8)c >= 0x80 && (UINT8)c <= 0x89) //color parsing! -Inuyasha 2.16.09
if ((UINT8)c & 0x80) //color parsing! -Inuyasha 2.16.09
continue;
if (c == '\n')