Merge branch 'special-top' into 'master'

Never top shake in Special

Closes #1433

See merge request kart-krew-dev/ring-racers-internal!2571
This commit is contained in:
Oni VelocitOni 2025-05-24 19:10:41 +00:00
commit c8e9adcc98

View file

@ -12149,7 +12149,9 @@ void K_KartUpdatePosition(player_t *player)
/* except in FREE PLAY */
if (player->curshield == KSHIELD_TOP &&
(gametyperules & GTR_CIRCUIT) &&
realplayers > 1)
realplayers > 1 &&
!specialstageinfo.valid
&& !K_Cooperative())
{
/* grace period so you don't fall off INSTANTLY */
if (K_GetItemRouletteDistance(player, 8) < 2000 && player->topinfirst < 2*TICRATE) // "Why 8?" Literally no reason, but since we intend for constant-ish distance we choose a fake fixed playercount.