Merge branch 'dont-fastforward-prisons' into 'master'

Don't fastforward/pause ghosts in non-attack-start gametypes

Closes #1121

See merge request KartKrew/Kart!2026
This commit is contained in:
Oni 2024-03-06 22:07:44 +00:00
commit c6e5797120

View file

@ -1255,7 +1255,7 @@ void G_GhostTicker(void)
}
// Pause jhosts that cross until the timer starts.
if (g->linecrossed && leveltime < starttime)
if (g->linecrossed && leveltime < starttime && G_TimeAttackStart())
continue;
readghosttic:
@ -1566,7 +1566,7 @@ skippedghosttic:
}
// If the timer started, skip ahead until the ghost starts too.
if (starttime <= leveltime && !g->linecrossed)
if (starttime <= leveltime && !g->linecrossed && G_TimeAttackStart())
goto readghosttic;
p = g;