stjr/SRB2
0
0
Fork 0
mirror of https://git.do.srb2.org/STJr/SRB2.git synced 2024-11-15 01:01:33 +00:00
Code Issues Projects Releases Packages Wiki Activity

Fix softlocking as Sonic & Tails when Player 2 has no name

Browse source
This commit is contained in:
Gustaf Alhäll 2023-07-16 23:25:22 +02:00
parent 9a31064c4a
commit 1ced8acc6a
No known key found for this signature in database
GPG key ID: 6C1F67D690CDEDFD
1 changed files with 4 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
src/d_clisrv.c
View file

@ -1293,6 +1293,7 @@ static boolean CL_AskFileList(INT32 firstfile)
static boolean CL_SendJoin(void)
{
UINT8 localplayers = 1;
char const *player2name;
if (netgame)
CONS_Printf(M_GetText("Sending join request...\n"));
netbuffer->packettype = PT_CLIENTJOIN;
@ -1309,9 +1310,11 @@ static boolean CL_SendJoin(void)
CleanupPlayerName(consoleplayer, cv_playername.zstring);
if (splitscreen)
CleanupPlayerName(1, cv_playername2.zstring);/* 1 is a HACK? oh no */
// Avoid empty string on bots to avoid softlocking in singleplayer
player2name = botingame ? "a" : cv_playername2.zstring;
strncpy(netbuffer->u.clientcfg.names[0], cv_playername.zstring, MAXPLAYERNAME);
strncpy(netbuffer->u.clientcfg.names[1], cv_playername2.zstring, MAXPLAYERNAME);
strncpy(netbuffer->u.clientcfg.names[1], player2name, MAXPLAYERNAME);
return HSendPacket(servernode, true, 0, sizeof (clientconfig_pak));
}