thirdpartymirrors/RingRacers
1
0
Fork 0
mirror of https://github.com/KartKrewDev/RingRacers.git synced 2026-04-27 20:41:46 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

UCRP_FALLOFF, UCRP_TOUCHOFFROAD, UCRP_TOUCHSNEAKERPANEL, UCRP_RINGDEBT: Only evaluate the "false" case if the player is exiting or has PF_NOCONTEST

Browse source
This commit is contained in:
toaster 2023-10-17 23:14:19 +01:00
parent 35ca8e6191
commit 90a65220b2
2 changed files with 15 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/d_player.h
View file

@ -410,6 +410,8 @@ struct roundconditions_t
boolean touched_offroad; boolean touched_offroad;
boolean touched_sneakerpanel; boolean touched_sneakerpanel;
boolean debt_rings; boolean debt_rings;
// Basically the same, but it's a specific event where no is an easy default
boolean tripwire_hyuu; boolean tripwire_hyuu;
boolean spb_neuter; boolean spb_neuter;
boolean landmine_dunk; boolean landmine_dunk;

21
src/m_cond.c
View file

@ -1606,13 +1606,18 @@ boolean M_CheckCondition(condition_t *cn, player_t *player)
return !!(player->roundconditions.unlocktriggers & (1 << cn->requirement)); return !!(player->roundconditions.unlocktriggers & (1 << cn->requirement));
case UCRP_FALLOFF: case UCRP_FALLOFF:
return (player->roundconditions.fell_off == (cn->requirement == 1)); return ((cn->requirement == 1 || player->exiting || (player->pflags & PF_NOCONTEST))
&& player->roundconditions.fell_off == (cn->requirement == 1));
case UCRP_TOUCHOFFROAD: case UCRP_TOUCHOFFROAD:
return (player->roundconditions.touched_offroad == (cn->requirement == 1)); return ((cn->requirement == 1 || player->exiting || (player->pflags & PF_NOCONTEST))
&& player->roundconditions.touched_offroad == (cn->requirement == 1));
case UCRP_TOUCHSNEAKERPANEL: case UCRP_TOUCHSNEAKERPANEL:
return (player->roundconditions.touched_sneakerpanel == (cn->requirement == 1)); return ((cn->requirement == 1 || player->exiting || (player->pflags & PF_NOCONTEST))
&& player->roundconditions.touched_sneakerpanel == (cn->requirement == 1));
case UCRP_RINGDEBT: case UCRP_RINGDEBT:
return (!(gametyperules & GTR_SPHERES) && (player->roundconditions.debt_rings == (cn->requirement == 1))); return (!(gametyperules & GTR_SPHERES)
&& (cn->requirement == 1 || player->exiting || (player->pflags & PF_NOCONTEST))
&& (player->roundconditions.debt_rings == (cn->requirement == 1)));
case UCRP_TRIPWIREHYUU: case UCRP_TRIPWIREHYUU:
return (player->roundconditions.tripwire_hyuu); return (player->roundconditions.tripwire_hyuu);
@ -2383,13 +2388,13 @@ static const char *M_GetConditionString(condition_t *cn)
return "do something special"; return "do something special";
case UCRP_FALLOFF: case UCRP_FALLOFF:
return (cn->requirement == 1) ? "fall off the course" : "without falling off"; return (cn->requirement == 1) ? "fall off the course" : "don't fall off the course";
case UCRP_TOUCHOFFROAD: case UCRP_TOUCHOFFROAD:
return (cn->requirement == 1) ? "touch offroad" : "without touching any offroad"; return (cn->requirement == 1) ? "touch offroad" : "don't touch any offroad";
case UCRP_TOUCHSNEAKERPANEL: case UCRP_TOUCHSNEAKERPANEL:
return (cn->requirement == 1) ? "touch a Sneaker Panel" : "without touching any Sneaker Panels"; return (cn->requirement == 1) ? "touch a Sneaker Panel" : "don't touch any Sneaker Panels";
case UCRP_RINGDEBT: case UCRP_RINGDEBT:
return (cn->requirement == 1) ? "go into Ring debt" : "without going into Ring debt"; return (cn->requirement == 1) ? "go into Ring debt" : "don't go into Ring debt";
case UCRP_TRIPWIREHYUU: case UCRP_TRIPWIREHYUU:
return "go through Tripwire after getting snared by Hyudoro"; return "go through Tripwire after getting snared by Hyudoro";