From 7157d80d00569fbd3641cec409da594a55557ef0 Mon Sep 17 00:00:00 2001 From: eebrozgi Date: Tue, 3 Jun 2025 01:58:12 +0300 Subject: [PATCH] More tripwire leniency after invinc + fixed regression in rocketsneaker boost type separation What it says on the tin. Shoutouts to Ashnal for figuring out the regression before anyone got hit by it! --- src/k_kart.c | 5 +++++ src/p_saveg.cpp | 1 + 2 files changed, 6 insertions(+) diff --git a/src/k_kart.c b/src/k_kart.c index 64cea1ec2..60f743c81 100644 --- a/src/k_kart.c +++ b/src/k_kart.c @@ -9816,6 +9816,11 @@ void K_KartPlayerThink(player_t *player, ticcmd_t *cmd) player->invincibilitytimer--; if (player->invincibilitytimer && K_IsPlayerScamming(player)) player->invincibilitytimer--; + + // Extra tripwire leniency for the end of invincibility + if (player->invincibilitytimer <= 0) { + player->tripwireLeniency = max( player->tripwireLeniency, TICRATE ); + } } // The precise ordering of start-of-level made me want to cut my head off, diff --git a/src/p_saveg.cpp b/src/p_saveg.cpp index b3029e0fa..2c7b05fc9 100644 --- a/src/p_saveg.cpp +++ b/src/p_saveg.cpp @@ -1198,6 +1198,7 @@ static void P_NetUnArchivePlayers(savebuffer_t *save) players[i].numsneakers = READUINT8(save->p); players[i].panelsneakertimer = READUINT16(save->p); players[i].numpanelsneakers = READUINT8(save->p); + players[i].weaksneakertimer = READUINT16(save->p); players[i].numweaksneakers = READUINT8(save->p); players[i].floorboost = READUINT8(save->p);