thirdpartymirrors/RingRacers
1
0
Fork 0
mirror of https://github.com/KartKrewDev/RingRacers.git synced 2026-04-27 12:31:54 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Command_connect: Clean up + improved error message for attempting to use during the server join process (which includes Server Browser)

Browse source
This commit is contained in:
toaster 2023-09-02 17:06:17 +01:00
parent 90f97ef50a
commit 8300a438d2
1 changed files with 14 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

31
src/d_clisrv.c
View file

@ -2723,28 +2723,22 @@ static void Command_connect(void)
// we don't request a restart unless the filelist differs // we don't request a restart unless the filelist differs
server = false; server = false;
/*
if (!stricmp(COM_Argv(1), "self")) // Get the server node.
{ if (netgame)
servernode = 0;
server = true;
/// \bug should be but...
//SV_SpawnServer();
}
else
*/
{ {
// used in menu to connect to a server in the list // used in menu to connect to a server in the list
if (netgame && !stricmp(COM_Argv(1), "node")) if (stricmp(COM_Argv(1), "node") != 0)
{ {
servernode = (SINT8)atoi(COM_Argv(2)); CONS_Printf(M_GetText("You cannot connect via address while joining a server.\n"));
}
else if (netgame)
{
CONS_Printf(M_GetText("You cannot connect while in a game. End this game first.\n"));
return; return;
} }
else if (I_NetOpenSocket) servernode = (SINT8)atoi(COM_Argv(2));
}
else
{
// Standard behaviour
if (I_NetOpenSocket)
{ {
I_NetOpenSocket(); I_NetOpenSocket();
netgame = true; netgame = true;
@ -2771,7 +2765,10 @@ static void Command_connect(void)
} }
} }
else else
{
CONS_Alert(CONS_ERROR, M_GetText("There is no network driver\n")); CONS_Alert(CONS_ERROR, M_GetText("There is no network driver\n"));
return;
}
} }
if (splitscreen != cv_splitplayers.value-1) if (splitscreen != cv_splitplayers.value-1)