From 6993f12dff9634bc35caa1562865c780159b8143 Mon Sep 17 00:00:00 2001
From: James R <justsomejames2@gmail.com>
Date: Thu, 7 Mar 2024 00:40:24 -0800
Subject: [PATCH] Power-ups: dropped power-ups always have at least 15 seconds

---
 src/k_battle.h    | 1 +
 src/k_powerup.cpp | 3 ++-
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/k_battle.h b/src/k_battle.h
index f1310e4d1..7806894e5 100644
--- a/src/k_battle.h
+++ b/src/k_battle.h
@@ -11,6 +11,7 @@ extern "C" {
 #define BATTLE_SPAWN_INTERVAL (4*TICRATE)
 #define BATTLE_DESPAWN_TIME (15*TICRATE)
 #define BATTLE_POWERUP_TIME (30*TICRATE)
+#define BATTLE_POWERUP_DROPPED_TIME (15*TICRATE)
 #define BATTLE_UFO_TIME (20*TICRATE)
 
 extern struct battleovertime
diff --git a/src/k_powerup.cpp b/src/k_powerup.cpp
index b2f7c720e..5472eec34 100644
--- a/src/k_powerup.cpp
+++ b/src/k_powerup.cpp
@@ -2,6 +2,7 @@
 
 #include <algorithm>
 
+#include "k_battle.h"
 #include "k_kart.h"
 #include "k_objects.h"
 #include "k_powerup.h"
@@ -127,7 +128,7 @@ void K_DropPowerUps(player_t* player)
 
 		if (remaining)
 		{
-			K_DropPaperItem(player, powerup, remaining);
+			K_DropPaperItem(player, powerup, std::max<tic_t>(remaining, BATTLE_POWERUP_DROPPED_TIME));
 			callback();
 		}
 	};