vivlim/Kart-Public
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Try a partial disconnect instead

Browse source
This commit is contained in:
fickleheart 2019-03-09 23:56:13 -06:00
parent 386360ff43
commit ce81504410
1 changed files with 8 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

26
src/d_clisrv.c
View file

@ -2109,7 +2109,7 @@ static boolean CL_ServerConnectionTicker(boolean viams, const char *tmpsave, tic
#endif #endif
case CL_CHALLENGE: case CL_CHALLENGE:
(*asksent) = I_GetTime() - NEWTICRATE + 2; // This is SUPPOSED to remove the delay from sending the password but it doesn't work... (*asksent) = I_GetTime() - NEWTICRATE; // This is SUPPOSED to remove the delay from sending the password but it doesn't work...
break; break;
case CL_WAITJOINRESPONSE: case CL_WAITJOINRESPONSE:
@ -2229,26 +2229,16 @@ boolean CL_Responder(event_t *ev)
} }
else if (ch == KEY_ENTER) else if (ch == KEY_ENTER)
{ {
// Done? Try to reconnect to the server... netgame = true;
if (!netgame && I_NetOpenSocket) multiplayer = true;
{
MSCloseUDPSocket(); // Tidy up before wiping the slate.
if (I_NetOpenSocket())
{
netgame = true;
multiplayer = true;
#ifndef NONET #ifndef NONET
SL_ClearServerList(servernode); SL_ClearServerList(servernode);
#endif #endif
cl_mode = CL_SEARCHING; cl_mode = CL_SEARCHING;
D_ComputeChallengeAnswer(cl_challengequestion, cl_challengepassword, cl_challengeanswer); D_ComputeChallengeAnswer(cl_challengequestion, cl_challengepassword, cl_challengeanswer);
cl_challengeattempted = 1; cl_challengeattempted = 1;
}
}
else
I_Error("haha that ain't it");
} }
return true; return true;
@ -3975,7 +3965,7 @@ static void HandlePacketFromAwayNode(SINT8 node)
cl_challengenum = netbuffer->u.joinchallenge.challengenum; cl_challengenum = netbuffer->u.joinchallenge.challengenum;
memcpy(cl_challengequestion, netbuffer->u.joinchallenge.question, 16); memcpy(cl_challengequestion, netbuffer->u.joinchallenge.question, 16);
D_CloseConnection(); // Don't need to stay connected while challenging Net_CloseConnection(node|FORCECLOSE); // Don't need to stay connected while challenging
cl_mode = CL_CHALLENGE; cl_mode = CL_CHALLENGE;