Merge branch 'shorter-void-time' into 'master'

Shorten fault void time by about 1 second for position pitfalls

See merge request KartKrew/Kart!2362
This commit is contained in:
Oni 2024-05-05 22:42:39 +00:00
commit e323a8b939
2 changed files with 2 additions and 2 deletions

View file

@ -9137,7 +9137,7 @@ void K_KartPlayerThink(player_t *player, ticcmd_t *cmd)
{
if (rainbowstartavailable && ((leveltime <= starttime) || (leveltime - starttime < 10*TICRATE)))
{
player->nocontrol = 50;
player->nocontrol = TICRATE/2;
player->mo->renderflags |= RF_DONTDRAW;
player->mo->flags |= MF_NOCLIPTHING;
}

View file

@ -104,7 +104,7 @@ static void K_RespawnAtWaypoint(player_t *player, waypoint_t *waypoint)
void K_DoFault(player_t *player)
{
player->nocontrol = (starttime - leveltime) + 50;
player->nocontrol = (starttime - leveltime) + TICRATE/2;
if (!(player->pflags & PF_FAULT))
{
S_StartSound(player->mo, sfx_s3k83);