thirdpartymirrors/RingRacers
1
0
Fork 0
mirror of https://github.com/KartKrewDev/RingRacers.git synced 2026-05-10 02:41:49 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

UCRP_CHASEDBYSPB

Browse source 
True if the player has PF_RINGLOCK (SPB on the HUD). Probably the cleanest implementation.
Stacks well with "finish in 1st".
This commit is contained in:
toaster 2023-10-18 00:10:40 +01:00
parent a746c4f33f
commit acdb7fd869
3 changed files with 12 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
src/deh_soc.c
View file

@ -2900,7 +2900,8 @@ static void readcondition(UINT16 set, UINT32 id, char *word2)
|| (++offset && fastcmp(params[0], "FINISHPERFECT")) || (++offset && fastcmp(params[0], "FINISHPERFECT"))
|| (++offset && fastcmp(params[0], "FINISHALLPRISONS")) || (++offset && fastcmp(params[0], "FINISHALLPRISONS"))
|| (++offset && fastcmp(params[0], "NOCONTEST")) || (++offset && fastcmp(params[0], "NOCONTEST"))
|| (++offset && fastcmp(params[0], "SMASHUFO"))) || (++offset && fastcmp(params[0], "SMASHUFO"))
|| (++offset && fastcmp(params[0], "CHASEDBYSPB")))
{ {
//PARAMCHECK(1); //PARAMCHECK(1);
ty = UCRP_FINISHCOOL + offset; ty = UCRP_FINISHCOOL + offset;

8
src/m_cond.c
View file

@ -1513,6 +1513,11 @@ boolean M_CheckCondition(condition_t *cn, player_t *player)
|| specialstageinfo.ufo->health <= 1 || specialstageinfo.ufo->health <= 1
) )
); );
case UCRP_CHASEDBYSPB:
// The PERFECT implementation would check spbplace, iterate over trackercap, etc.
// But the game already has this handy-dandy SPB signal for us...
// It's only MAYBE invalid in modded context. And mods can already cheat...
return ((player->pflags & PF_RINGLOCK) == PF_RINGLOCK);
case UCRP_MAKERETIRE: case UCRP_MAKERETIRE:
{ {
@ -2387,6 +2392,9 @@ static const char *M_GetConditionString(condition_t *cn)
cn->requirement cn->requirement
); );
case UCRP_CHASEDBYSPB:
return "while chased by a Self-Propelled Bomb";
case UCRP_TRIGGER: case UCRP_TRIGGER:
return "do something special"; return "do something special";

2
src/m_cond.h
View file

@ -97,7 +97,9 @@ typedef enum
UCRP_FINISHPERFECT, // Finish a perfect race UCRP_FINISHPERFECT, // Finish a perfect race
UCRP_FINISHALLPRISONS, // Break all prisons UCRP_FINISHALLPRISONS, // Break all prisons
UCRP_NOCONTEST, // No Contest UCRP_NOCONTEST, // No Contest
UCRP_SMASHUFO, // Smash the UFO Catcher UCRP_SMASHUFO, // Smash the UFO Catcher
UCRP_CHASEDBYSPB, // Chased by SPB
UCRP_MAKERETIRE, // Make another player of [skin] No Contest UCRP_MAKERETIRE, // Make another player of [skin] No Contest