thirdpartymirrors/RingRacers
1
0
Fork 0
mirror of https://github.com/KartKrewDev/RingRacers.git synced 2025-10-30 08:01:28 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Character select can open without crashing

Browse source
This commit is contained in:
Sally Coolatta 2020-08-15 22:40:49 -04:00
parent ae4ea9eda2
commit a2caa2dc16
2 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/d_netcmd.c
View file

@ -1479,7 +1479,7 @@ static void SendNameAndColor(UINT8 n)
WRITEUINT16(p, (UINT16)cv_playercolor[n].value); WRITEUINT16(p, (UINT16)cv_playercolor[n].value);
WRITEUINT8(p, (UINT8)cv_skin[n].value); WRITEUINT8(p, (UINT8)cv_skin[n].value);
WRITESINT8(p, (UINT8)cv_follower[n].value); WRITESINT8(p, (UINT8)cv_follower[n].value);
WRITESINT8(p, (UINT8)cv_followercolor[n].value); WRITEUINT16(p, (UINT8)cv_followercolor[n].value);
SendNetXCmdForPlayer(n, XD_NAMEANDCOLOR, buf, p - buf); SendNetXCmdForPlayer(n, XD_NAMEANDCOLOR, buf, p - buf);
} }

8
src/m_menu.c
View file

@ -9563,7 +9563,7 @@ static void M_DrawSetupMultiPlayerMenu(void)
INT32 offx = 8, offy = 8; INT32 offx = 8, offy = 8;
patch_t *cursor; patch_t *cursor;
static UINT8 cursorframe = 0; static UINT8 cursorframe = 0;
patch_t *face; //patch_t *face;
UINT8 *colmap; UINT8 *colmap;
if (skullAnimCounter % 4 == 0) if (skullAnimCounter % 4 == 0)
@ -9580,19 +9580,19 @@ static void M_DrawSetupMultiPlayerMenu(void)
if (!(k++)) if (!(k++))
{ {
scale = FRACUNIT; scale = FRACUNIT;
face = facewantprefix[col]; //face = facewantprefix[col];
offx = 12; offx = 12;
offy = 0; offy = 0;
} }
else else
{ {
scale = FRACUNIT/2; scale = FRACUNIT/2;
face = facerankprefix[col]; //face = facerankprefix[col];
offx = 8; offx = 8;
offy = 8; offy = 8;
} }
colmap = R_GetTranslationColormap(col, setupm_fakecolor->color, GTC_MENUCACHE); colmap = R_GetTranslationColormap(col, setupm_fakecolor->color, GTC_MENUCACHE);
V_DrawFixedPatch((x+offx)<<FRACBITS, (my+28+offy)<<FRACBITS, FRACUNIT, 0, face, colmap); //V_DrawFixedPatch((x+offx)<<FRACBITS, (my+28+offy)<<FRACBITS, FRACUNIT, 0, face, colmap);
if (scale == FRACUNIT) // bit of a hack if (scale == FRACUNIT) // bit of a hack
V_DrawFixedPatch((x+offx)<<FRACBITS, (my+28+offy)<<FRACBITS, FRACUNIT, 0, cursor, colmap); V_DrawFixedPatch((x+offx)<<FRACBITS, (my+28+offy)<<FRACBITS, FRACUNIT, 0, cursor, colmap);
if (++col >= numskins) if (++col >= numskins)