From 69ed0994905166144ecef59e7d76ccf6a40ce368 Mon Sep 17 00:00:00 2001 From: James R Date: Thu, 29 Feb 2024 18:26:23 -0800 Subject: [PATCH] Symmetrical safelap behavior - Do not increment lap during lightsnake - Symmetrical with decrement behavior - Let lap be restored to higher safelap - Prevent headaches if lap is erroneously decremented --- src/k_kart.c | 2 +- src/p_spec.c | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/src/k_kart.c b/src/k_kart.c index 0444d3c11..e65e68945 100644 --- a/src/k_kart.c +++ b/src/k_kart.c @@ -10858,7 +10858,7 @@ void K_UpdateAllPlayerPositions(void) if (player->respawn.state == RESPAWNST_MOVE && player->respawn.init == true && - player->lastsafelap < player->laps) + player->lastsafelap != player->laps) { player->laps = player->lastsafelap; player->cheatchecknum = player->lastsafecheatcheck; diff --git a/src/p_spec.c b/src/p_spec.c index 41b0f4841..0eae90798 100644 --- a/src/p_spec.c +++ b/src/p_spec.c @@ -1911,6 +1911,8 @@ static void K_HandleLapIncrement(player_t *player) { if (player) { + if (player->respawn.state == RESPAWNST_MOVE) + return; if (!G_TimeAttackStart() && leveltime < starttime && !(gametyperules & GTR_ROLLINGSTART)) { // freeze 'em until fault penalty is over