From 93e4ef0ef155e2fa1adc013d8a33237cb8c7ce00 Mon Sep 17 00:00:00 2001
From: toaster <rollerorbital@gmail.com>
Date: Wed, 9 Feb 2022 23:52:44 +0000
Subject: [PATCH] Permit players to not bounce when colliding with ML_NOTBOUNCY
 walls (imperfect but better than the LITERALLY NO SUPPORT that was there
 beforehand)

---
 src/p_map.c | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/src/p_map.c b/src/p_map.c
index a3902b159..5310df6d5 100644
--- a/src/p_map.c
+++ b/src/p_map.c
@@ -3823,10 +3823,19 @@ void P_BouncePlayerMove(mobj_t *mo)
 
 	if (P_IsLineTripWire(bestslideline))
 	{
+		// TRIPWIRE CANNOT BE MADE NONBOUNCY
 		K_ApplyTripWire(mo->player, TRIP_BLOCKED);
 	}
 	else
 	{
+		// Some walls aren't bouncy even if you are
+		if (bestslideline && (bestslideline->flags & ML_NOTBOUNCY))
+		{
+			// SRB2Kart: Non-bouncy line!
+			P_SlideMove(mo);
+			return;
+		}
+
 		K_SpawnBumpEffect(mo);
 	}