stjr/Kart-Public
0
0
Fork 0
mirror of https://git.do.srb2.org/KartKrew/Kart-Public.git synced 2025-03-10 11:22:35 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge descrepancies

Browse source
This commit is contained in:
James R 2019-11-19 12:06:15 -08:00
parent a5bf7719e7
commit 19443fec4c
1 changed files with 3 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
src/d_netcmd.c
View file

@ -2660,16 +2660,9 @@ static void Command_Map_f(void)
{ {
gametypename = COM_Argv(option_gametype + 1); gametypename = COM_Argv(option_gametype + 1);
for (i = 0; gametype_cons_t[i].strvalue; i++) newgametype = G_GetGametypeByName(gametypename);
if (!strcasecmp(gametype_cons_t[i].strvalue, arg_gametype))
{
// Don't do any variable setting here. Wait until you get your
// map packet first to avoid sending the same info twice!
newgametype = gametype_cons_t[i].value;
break;
}
if (!gametype_cons_t[i].strvalue) // reached end of the list with no match if (newgametype == -1) // reached end of the list with no match
{ {
/* Did they give us a gametype number? That's okay too! */ /* Did they give us a gametype number? That's okay too! */
if (isdigit(gametypename[0])) if (isdigit(gametypename[0]))
@ -2690,7 +2683,7 @@ static void Command_Map_f(void)
} }
} }
if (!parm_force && newgametype == gametype) // SRB2Kart if (!option_force && newgametype == gametype) // SRB2Kart
newresetplayers = false; // if not forcing and gametypes is the same newresetplayers = false; // if not forcing and gametypes is the same
// don't use a gametype the map doesn't support // don't use a gametype the map doesn't support