thirdpartymirrors/RingRacers
1
0
Fork 0
mirror of https://github.com/KartKrewDev/RingRacers.git synced 2025-10-30 08:01:28 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Use GP difficulty str values instead of hardcoded "Master" exception

Browse source
This commit is contained in:
toaster 2022-10-11 16:41:48 +01:00
parent 44eb099cfb
commit dbc067f87a
2 changed files with 22 additions and 39 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

31
src/d_main.c
View file

@ -1801,29 +1801,20 @@ void D_SRB2Main(void)
INT16 newskill = -1; INT16 newskill = -1;
const char *sskill = M_GetNextParm(); const char *sskill = M_GetNextParm();
const char *masterstr = "Master"; for (j = 0; gpdifficulty_cons_t[j].strvalue; j++)
if (!strcasecmp(masterstr, sskill))
{ {
newskill = KARTGP_MASTER; if (!strcasecmp(gpdifficulty_cons_t[j].strvalue, sskill))
{
newskill = (INT16)gpdifficulty_cons_t[j].value;
break;
}
} }
else
{
for (j = 0; kartspeed_cons_t[j].strvalue; j++)
{
if (!strcasecmp(kartspeed_cons_t[j].strvalue, sskill))
{
newskill = (INT16)kartspeed_cons_t[j].value;
break;
}
}
if (!kartspeed_cons_t[j].strvalue) // reached end of the list with no match if (!gpdifficulty_cons_t[j].strvalue) // reached end of the list with no match
{ {
j = atoi(sskill); // assume they gave us a skill number, which is okay too j = atoi(sskill); // assume they gave us a skill number, which is okay too
if (j >= KARTSPEED_EASY && j <= KARTGP_MASTER) if (j >= KARTSPEED_EASY && j <= KARTGP_MASTER)
newskill = (INT16)j; newskill = (INT16)j;
}
} }
if (grandprixinfo.gp == true) if (grandprixinfo.gp == true)

30
src/d_netcmd.c
View file

@ -2967,32 +2967,24 @@ static void Command_Map_f(void)
if (option_skill) if (option_skill)
{ {
const char *masterstr = "Master";
const char *skillname = COM_Argv(option_skill + 1); const char *skillname = COM_Argv(option_skill + 1);
INT32 newskill = -1; INT32 newskill = -1;
INT32 j; INT32 j;
if (!strcasecmp(masterstr, skillname)) for (j = 0; gpdifficulty_cons_t[j].strvalue; j++)
{ {
newskill = KARTGP_MASTER; if (!strcasecmp(gpdifficulty_cons_t[j].strvalue, skillname))
{
newskill = (INT16)gpdifficulty_cons_t[j].value;
break;
}
} }
else
{
for (j = 0; kartspeed_cons_t[j].strvalue; j++)
{
if (!strcasecmp(kartspeed_cons_t[j].strvalue, skillname))
{
newskill = (INT16)kartspeed_cons_t[j].value;
break;
}
}
if (!kartspeed_cons_t[j].strvalue) // reached end of the list with no match if (!gpdifficulty_cons_t[j].strvalue) // reached end of the list with no match
{ {
INT32 num = atoi(COM_Argv(option_skill + 1)); // assume they gave us a skill number, which is okay too INT32 num = atoi(COM_Argv(option_skill + 1)); // assume they gave us a skill number, which is okay too
if (num >= KARTSPEED_EASY && num <= KARTGP_MASTER) if (num >= KARTSPEED_EASY && num <= KARTGP_MASTER)
newskill = (INT16)num; newskill = (INT16)num;
}
} }
if (newskill != -1) if (newskill != -1)