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

Discoveries while self-reviewing during description creation

Browse source 
- Rename "FinishAllPrisons" and correct text to refer to Prisons
- Do not hint at greater speeds for UCRP_ISDIFFICULTY
This commit is contained in:
toaster 2023-03-14 20:59:51 +00:00
parent 0124cf7356
commit 2d7ef00e29
3 changed files with 8 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/deh_soc.c
View file

@ -2694,7 +2694,7 @@ static void readcondition(UINT8 set, UINT32 id, char *word2)
ty = UCRP_PODIUMEMERALD + offset;
}
else if ((offset=0) || fastcmp(params[0], "FINISHCOOL")
|| (++offset && fastcmp(params[0], "FINISHALLCAPSULES"))
|| (++offset && fastcmp(params[0], "FINISHALLPRISONS"))
|| (++offset && fastcmp(params[0], "NOCONTEST")))
{
//PARAMCHECK(1);

16
src/m_cond.c
View file

@ -832,7 +832,7 @@ boolean M_CheckCondition(condition_t *cn, player_t *player)
&& !(player->pflags & PF_NOCONTEST)
&& M_NotFreePlay(player)
&& !K_IsPlayerLosing(player));
case UCRP_FINISHALLCAPSULES:
case UCRP_FINISHALLPRISONS:
return (battleprisons
&& !(player->pflags & PF_NOCONTEST)
//&& M_NotFreePlay(player)
@ -1276,19 +1276,15 @@ static const char *M_GetConditionString(condition_t *cn)
return va("with engine class %c", 'A' + cn->requirement);
case UCRP_ISDIFFICULTY:
{
const char *speedtext = "", *orbetter = "";
const char *speedtext = "";
if (cn->requirement == KARTSPEED_NORMAL)
{
speedtext = "on Normal difficulty";
//if (M_SecretUnlocked(SECRET_HARDSPEED, true))
orbetter = " or better";
speedtext = "on Normal difficulty or better";
}
else if (cn->requirement == KARTSPEED_HARD)
{
speedtext = "on Hard difficulty";
if (M_SecretUnlocked(SECRET_MASTERMODE, true))
orbetter = " or better";
}
else if (cn->requirement == KARTGP_MASTER)
{
@ -1298,7 +1294,7 @@ static const char *M_GetConditionString(condition_t *cn)
speedtext = "on ???";
}
return va("%s%s", speedtext, orbetter);
return speedtext;
}
case UCRP_PODIUMCUP:
@ -1356,8 +1352,8 @@ static const char *M_GetConditionString(condition_t *cn)
case UCRP_FINISHCOOL:
return "finish in good standing";
case UCRP_FINISHALLCAPSULES:
return "break every capsule";
case UCRP_FINISHALLPRISONS:
return "break every prison";
case UCRP_NOCONTEST:
return "NO CONTEST";
case UCRP_FINISHPLACE:

2
src/m_cond.h
View file

@ -81,7 +81,7 @@ typedef enum
UCRP_PODIUMPRIZE, // Get to podium sequence with that cup's bonus (alternate string version of UCRP_PODIUMEMERALD
UCRP_FINISHCOOL, // Finish in good standing
UCRP_FINISHALLCAPSULES, // Break all capsules
UCRP_FINISHALLPRISONS, // Break all prisons
UCRP_NOCONTEST, // No Contest
UCRP_FINISHPLACE, // Finish at least [place]