From 7cfcb2f61a243946ffbe8c7ca08c9b2f0ad0e51d Mon Sep 17 00:00:00 2001
From: TehRealSalt <tehrealsalt@gmail.com>
Date: Tue, 24 Sep 2019 02:00:27 -0400
Subject: [PATCH] Don't select items in the air or with the Ambush flag for
 overtime

---
 src/p_inter.c | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/src/p_inter.c b/src/p_inter.c
index 2029e6a48..022432af9 100644
--- a/src/p_inter.c
+++ b/src/p_inter.c
@@ -1857,15 +1857,24 @@ void P_CheckTimeLimit(void)
 							continue;
 						if (thismo->threshold == 69) // Disappears
 							continue;
+
 						b++;
+
+						// Only select items that are on the ground, ignore ones in the air. Ambush flag inverts this rule.
+						if ((!P_IsObjectOnGround(thismo)) != (thismo->flags2 & MF2_AMBUSH))
+							continue;
+
 						if (item == NULL || (b < nummapboxes && P_RandomChance(((nummapboxes-b)*FRACUNIT)/nummapboxes))) // This is to throw off the RNG some
 							item = thismo;
 						if (b >= nummapboxes) // end early if we've found them all already
 							break;
 					}
 
-					if (item == NULL) // no item found?!
+					if (item == NULL) // no item found, could happen if every item is in the air or has ambush flag, or the map has none
+					{
+						CONS_Alert(CONS_WARNING, "No usuable items for Battle overtime!\n");
 						return;
+					}
 
 					item->threshold = 70; // Set constant respawn
 					battleovertime.x = item->x;