From e2dcc35bcd5585709e320b4d87a713e2c50bf140 Mon Sep 17 00:00:00 2001
From: Sally Coolatta <tehrealsalt@gmail.com>
Date: Fri, 12 Feb 2021 20:25:03 -0500
Subject: [PATCH] Reset properties on map load

---
 src/g_game.c  | 6 +++---
 src/k_kart.c  | 6 ++++++
 src/k_kart.h  | 1 +
 src/p_setup.c | 2 ++
 4 files changed, 12 insertions(+), 3 deletions(-)

diff --git a/src/g_game.c b/src/g_game.c
index 0a494918f..155633606 100644
--- a/src/g_game.c
+++ b/src/g_game.c
@@ -246,11 +246,11 @@ INT32 gameovertics = 15*TICRATE;
 UINT8 ammoremovaltics = 2*TICRATE;
 
 // SRB2kart
-tic_t introtime = 0;
-tic_t starttime = 0;
+tic_t introtime = 3;
+tic_t starttime = 3;
 
 const tic_t bulbtime = TICRATE/2;
-UINT8 numbulbs = 0;
+UINT8 numbulbs = 1;
 
 tic_t raceexittime = 5*TICRATE + (2*TICRATE/3);
 tic_t battleexittime = 8*TICRATE;
diff --git a/src/k_kart.c b/src/k_kart.c
index 026ac665f..5a808a7b4 100644
--- a/src/k_kart.c
+++ b/src/k_kart.c
@@ -43,6 +43,12 @@
 // indirectitemcooldown is timer before anyone's allowed another Shrink/SPB
 // mapreset is set when enough players fill an empty server
 
+void K_TimerReset(void)
+{
+	starttime = introtime = 3;
+	numbulbs = 1;
+}
+
 void K_TimerInit(void)
 {
 	UINT8 i;
diff --git a/src/k_kart.h b/src/k_kart.h
index 71073587e..0e3aa0ff4 100644
--- a/src/k_kart.h
+++ b/src/k_kart.h
@@ -17,6 +17,7 @@ angle_t K_ReflectAngle(angle_t angle, angle_t against, fixed_t maxspeed, fixed_t
 
 void K_RegisterKartStuff(void);
 
+void K_TimerReset(void);
 void K_TimerInit(void);
 UINT16 K_GetPlayerDontDrawFlag(player_t *player);
 boolean K_IsPlayerLosing(player_t *player);
diff --git a/src/p_setup.c b/src/p_setup.c
index a9e05f6f8..6ffb2e427 100644
--- a/src/p_setup.c
+++ b/src/p_setup.c
@@ -4157,6 +4157,8 @@ boolean P_LoadLevel(boolean fromnetsave)
 		LUAh_MapLoad();
 	}
 
+	K_TimerReset();
+
 	// No render mode, stop here.
 	if (rendermode == render_none)
 		return true;