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

Merge branch 'all-prisons-finish-conditions' into 'master'

Browse source 
FinishTime conditions: Guarantee all Prison Eggs broken before award

See merge request KartKrew/Kart!2244
This commit is contained in:
Sal 2024-04-09 07:40:54 +00:00
commit 38274046a9
1 changed files with 3 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
src/m_cond.c
View file

@ -1822,17 +1822,20 @@ boolean M_CheckCondition(condition_t *cn, player_t *player)
case UCRP_FINISHTIME: case UCRP_FINISHTIME:
return (player->exiting return (player->exiting
&& !(player->pflags & PF_NOCONTEST) && !(player->pflags & PF_NOCONTEST)
&& (!battleprisons || numtargets >= maptargets)
//&& M_NotFreePlay() //&& M_NotFreePlay()
&& player->realtime <= (unsigned)cn->requirement); && player->realtime <= (unsigned)cn->requirement);
case UCRP_FINISHTIMEEXACT: case UCRP_FINISHTIMEEXACT:
return (player->exiting return (player->exiting
&& !(player->pflags & PF_NOCONTEST) && !(player->pflags & PF_NOCONTEST)
&& (!battleprisons || numtargets >= maptargets)
//&& M_NotFreePlay() //&& M_NotFreePlay()
&& player->realtime/TICRATE == (unsigned)cn->requirement/TICRATE); && player->realtime/TICRATE == (unsigned)cn->requirement/TICRATE);
case UCRP_FINISHTIMELEFT: case UCRP_FINISHTIMELEFT:
return (timelimitintics return (timelimitintics
&& player->exiting && player->exiting
&& !(player->pflags & PF_NOCONTEST) && !(player->pflags & PF_NOCONTEST)
&& (!battleprisons || numtargets >= maptargets)
&& !K_CanChangeRules(false) // too easy to change cv_timelimit && !K_CanChangeRules(false) // too easy to change cv_timelimit
&& player->realtime < timelimitintics && player->realtime < timelimitintics
&& (timelimitintics + extratimeintics + secretextratime - player->realtime) >= (unsigned)cn->requirement); && (timelimitintics + extratimeintics + secretextratime - player->realtime) >= (unsigned)cn->requirement);