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

UC_ALLCHAOS, UC_ALLSUPER, UC_ALLEMERALDS: Move to using KARTSPEED/KARTGP constants directly

Browse source
This commit is contained in:
toaster 2023-03-11 19:42:20 +00:00
parent c67412f6ef
commit f411ca1e85
2 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
src/deh_soc.c
View file

@ -2483,15 +2483,15 @@ static void readcondition(UINT8 set, UINT32 id, char *word2)
{ {
//PARAMCHECK(1); //PARAMCHECK(1);
ty = UC_ALLCHAOS + offset; ty = UC_ALLCHAOS + offset;
re = 1; re = KARTSPEED_NORMAL;
if (params[1]) if (params[1])
{ {
if (fastcmp(params[1], "NORMAL")) if (fastcmp(params[1], "NORMAL"))
; ;
else if (fastcmp(params[1], "HARD")) else if (fastcmp(params[1], "HARD"))
x1 = 2; x1 = KARTSPEED_HARD;
else if (fastcmp(params[1], "MASTER")) else if (fastcmp(params[1], "MASTER"))
x1 = 3; x1 = KARTGP_MASTER;
else else
{ {
deh_warning("gamespeed requirement \"%s\" invalid for condition ID %d", params[1], id+1); deh_warning("gamespeed requirement \"%s\" invalid for condition ID %d", params[1], id+1);

6
src/m_cond.c
View file

@ -1079,19 +1079,19 @@ static const char *M_GetConditionString(condition_t *cn)
else else
chaostext = "14"; chaostext = "14";
if (cn->requirement == 1) if (cn->requirement == KARTSPEED_NORMAL)
{ {
speedtext = " on Normal difficulty"; speedtext = " on Normal difficulty";
//if (M_SecretUnlocked(SECRET_HARDSPEED, true)) //if (M_SecretUnlocked(SECRET_HARDSPEED, true))
orbetter = " or better"; orbetter = " or better";
} }
else if (cn->requirement == 2) else if (cn->requirement == KARTSPEED_HARD)
{ {
speedtext = " on Hard difficulty"; speedtext = " on Hard difficulty";
if (M_SecretUnlocked(SECRET_MASTERMODE, true)) if (M_SecretUnlocked(SECRET_MASTERMODE, true))
orbetter = " or better"; orbetter = " or better";
} }
else if (cn->requirement == 3) else if (cn->requirement == KARTGP_MASTER)
{ {
speedtext = " on Master difficulty"; speedtext = " on Master difficulty";
} }