Merge branch 'splitscreen-titlecards-fix' into 'master'

Fix splitscreen Title Card act name regression

See merge request STJr/SRB2!934
This commit is contained in:
SteelT 2020-05-11 18:18:22 -04:00
commit 78fe9af56a
1 changed files with 4 additions and 5 deletions

View File

@ -1333,13 +1333,12 @@ void ST_drawTitleCard(void)
patch_t *actpat, *zigzag, *zztext;
UINT8 colornum;
const UINT8 *colormap;
stplyr = &players[consoleplayer];
if (stplyr->skincolor)
colornum = stplyr->skincolor;
if (players[consoleplayer].skincolor)
colornum = players[consoleplayer].skincolor;
else
colornum = cv_playercolor.value;
colormap = R_GetTranslationColormap(TC_DEFAULT, colornum, GTC_CACHE);
if (!G_IsTitleCardAvailable())