thirdpartymirrors/RingRacers
1
0
Fork 0
mirror of https://github.com/KartKrewDev/RingRacers.git synced 2025-12-23 16:32:36 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'server-param' into 'master'

Browse source 
-server for map command

See merge request KartKrew/Kart!1350
This commit is contained in:
Oni 2023-07-24 23:13:50 +00:00
commit ddf55d4040
1 changed files with 89 additions and 46 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

95
src/d_netcmd.c
View file

@ -2878,6 +2878,8 @@ static void Command_Map_f(void)
size_t option_gametype; size_t option_gametype;
size_t option_encore; size_t option_encore;
size_t option_skill; size_t option_skill;
size_t option_server;
size_t option_match;
boolean newresetplayers; boolean newresetplayers;
boolean newforcespecialstage; boolean newforcespecialstage;
@ -2901,7 +2903,9 @@ static void Command_Map_f(void)
option_force = COM_CheckPartialParm("-f"); option_force = COM_CheckPartialParm("-f");
option_gametype = COM_CheckPartialParm("-g"); option_gametype = COM_CheckPartialParm("-g");
option_encore = COM_CheckPartialParm("-e"); option_encore = COM_CheckPartialParm("-e");
option_skill = COM_CheckPartialParm("-s"); option_skill = COM_CheckParm("-skill");
option_server = COM_CheckParm("-server");
option_match = COM_CheckParm("-match");
newresetplayers = ! COM_CheckParm("-noresetplayers"); newresetplayers = ! COM_CheckParm("-noresetplayers");
newforcespecialstage = COM_CheckParm("-forcespecialstage"); newforcespecialstage = COM_CheckParm("-forcespecialstage");
@ -3012,10 +3016,73 @@ static void Command_Map_f(void)
} }
} }
if (!(netgame || multiplayer))
{ {
if ((option_match && option_server)
|| (option_match && option_skill)
|| (option_server && option_skill))
{
CONS_Alert(CONS_WARNING, M_GetText("These options can't be combined.\nSelect only one out of -server, -match, or -skill.\n"));
Z_Free(realmapname);
Z_Free(mapname);
return;
}
if (!Playing())
{
UINT8 ssplayers = cv_splitplayers.value-1;
boolean newnetgame = (option_server != 0);
multiplayer = true;
netgame = false;
strncpy(connectedservername, cv_servername.string, MAXSERVERNAME);
if (cv_maxconnections.value < ssplayers+1)
CV_SetValue(&cv_maxconnections, ssplayers+1);
SV_StartSinglePlayerServer(newgametype, newnetgame);
if (splitscreen != ssplayers)
{
splitscreen = ssplayers;
SplitScreen_OnChange();
}
if (!newnetgame && option_match == 0)
{
grandprixinfo.gp = true;
grandprixinfo.initalize = true;
grandprixinfo.cup = NULL;
grandprixinfo.gamespeed = (cv_kartspeed.value == KARTSPEED_AUTO ? KARTSPEED_NORMAL : cv_kartspeed.value); grandprixinfo.gamespeed = (cv_kartspeed.value == KARTSPEED_AUTO ? KARTSPEED_NORMAL : cv_kartspeed.value);
grandprixinfo.masterbots = false; grandprixinfo.masterbots = false;
}
if (newnetgame)
{
restoreMenu = &PLAY_MP_OptSelectDef;
}
else
{
restoreMenu = NULL;
}
M_ClearMenus(true);
}
else if (
((grandprixinfo.gp == true ? option_match : option_skill) != 0) // Can't swap between.
|| (!netgame && (option_server != 0)) // Can't promote to server.
)
{
CONS_Alert(CONS_WARNING, M_GetText("You are already playing a game.\nReturn to the menu to use this option.\n"));
Z_Free(realmapname);
Z_Free(mapname);
return;
}
if (grandprixinfo.gp)
{
grandprixinfo.wonround = false;
if (option_skill) if (option_skill)
{ {
@ -3053,30 +3120,6 @@ static void Command_Map_f(void)
} }
} }
} }
grandprixinfo.gp = true;
grandprixinfo.wonround = false;
if (!Playing())
{
UINT8 ssplayers = cv_splitplayers.value-1;
grandprixinfo.cup = NULL;
grandprixinfo.initalize = true;
multiplayer = true;
restoreMenu = NULL;
strncpy(connectedservername, cv_servername.string, MAXSERVERNAME);
if (cv_maxconnections.value < ssplayers+1)
CV_SetValue(&cv_maxconnections, ssplayers+1);
if (splitscreen != ssplayers)
{
splitscreen = ssplayers;
SplitScreen_OnChange();
}
} }
} }