From 74ad3c00652e77130cfef8028537c3148db9cfed Mon Sep 17 00:00:00 2001
From: NepDisk <nepdisk@noreply.codeberg.org>
Date: Sun, 29 Jun 2025 20:41:29 -0400
Subject: [PATCH] Make flameshield use DMG_FLIPOVER and cleanup

---
 src/d_main.cpp    | 4 ++--
 src/info/sounds.h | 9 +++------
 src/k_collide.c   | 4 ++--
 src/k_kart.c      | 6 +++---
 src/p_setup.c     | 2 +-
 5 files changed, 11 insertions(+), 14 deletions(-)

diff --git a/src/d_main.cpp b/src/d_main.cpp
index 3ba1db0d4..645d3e90c 100644
--- a/src/d_main.cpp
+++ b/src/d_main.cpp
@@ -86,8 +86,8 @@
 #define ASSET_HASH_TEXTURES_KART       0xb4211b2f32b6a291
 #define ASSET_HASH_CHARS_KART          0x1e68a3e01aa5c68b
 #define ASSET_HASH_MAPS_KART           0x38558ed00da41ce9
-#define ASSET_HASH_MAIN_PK3            0x7fbb80904dbc97d7
-#define ASSET_HASH_MAPPATCH_PK3        0x93a9213b2b2ba260
+#define ASSET_HASH_MAIN_PK3            0x9485c3d887761789
+#define ASSET_HASH_MAPPATCH_PK3        0x6eb8b036f76fbbda
 #define ASSET_HASH_BONUSCHARS_KART     0x60e6f13d822a7461
 #ifdef USE_PATCH_FILE
 #define ASSET_HASH_PATCH_PK3           0x0000000000000000
diff --git a/src/info/sounds.h b/src/info/sounds.h
index 97f198731..dc2dc3b40 100644
--- a/src/info/sounds.h
+++ b/src/info/sounds.h
@@ -786,9 +786,6 @@ _(kc6c)
 _(kc6d)
 _(kc6e)
 
-// MKDS sounds
-_(mdse8)
-
 // SRB2kart
 _(slip)
 _(screec)
@@ -846,9 +843,6 @@ _(requst)
 _(syfail)
 _(itfree)
 _(dbgsal)
-_(typri1)
-_(typri2)
-_(eggspr)
 
 // Chaining Sound
 _(bstchn)
@@ -856,6 +850,9 @@ _(bstchn)
 // Low Ring Sound
 _(ringlw)
 
+// Flip Over Sound
+_(flipos)
+
 // Shout message sound effect
 _(sysmsg)
 
diff --git a/src/k_collide.c b/src/k_collide.c
index 57441cad0..f1800262f 100644
--- a/src/k_collide.c
+++ b/src/k_collide.c
@@ -746,12 +746,12 @@ boolean K_PvPTouchDamage(mobj_t *t1, mobj_t *t2)
 
 	if (t1Condition == true && t2Condition == false)
 	{
-		P_DamageMobj(t2, t1, t1, 1, DMG_WIPEOUT);
+		P_DamageMobj(t2, t1, t1, 1, DMG_FLIPOVER);
 		return true;
 	}
 	else if (t1Condition == false && t2Condition == true)
 	{
-		P_DamageMobj(t1, t2, t2, 1, DMG_WIPEOUT);
+		P_DamageMobj(t1, t2, t2, 1, DMG_FLIPOVER);
 		return true;
 	}
 
diff --git a/src/k_kart.c b/src/k_kart.c
index e5aee809c..cef772d53 100644
--- a/src/k_kart.c
+++ b/src/k_kart.c
@@ -896,8 +896,8 @@ INT32 K_KartGetItemOdds(
                 newodds = K_KartGetInvincibilityOdds(clusterDist);
                 
                 newodds *= 4;
-                break;
             }
+            break;
 		case KITEM_MINE:
 		case KITEM_GROW:
 		case KITEM_BUBBLESHIELD:
@@ -2166,7 +2166,7 @@ boolean K_KartBouncing(mobj_t *mobj1, mobj_t *mobj2, boolean bounce, boolean sol
 
 		if (mobj1->player->pflags & PF_JUSTFLIPPED)
 		{
-			S_StartSound(mobj2, sfx_mdse8);
+			S_StartSound(mobj2, sfx_flipos);
 			mobj1->player->flipoverangle = R_PointToAngle2(0,0,mobj1->player->rmomx,mobj1->player->rmomy);
 			P_InstaThrust(mobj1, mobj1->player->flipoverangle, FixedMul(FLIPOVERSPEED, mobj1->scale));
 			mobj1->momz = FixedMul(FlipOverZMomentum(gravity), mobj1->scale);
@@ -2202,7 +2202,7 @@ boolean K_KartBouncing(mobj_t *mobj1, mobj_t *mobj2, boolean bounce, boolean sol
 
 		if (mobj2->player->pflags & PF_JUSTFLIPPED)
 		{
-			S_StartSound(mobj1, sfx_mdse8);
+			S_StartSound(mobj2, sfx_flipos);
 			mobj2->player->flipoverangle = R_PointToAngle2(0,0,mobj2->player->rmomx,mobj2->player->rmomy);
 			P_InstaThrust(mobj2, mobj2->player->flipoverangle, FixedMul(FLIPOVERSPEED, mobj2->scale));
 			mobj2->momz = FixedMul(FlipOverZMomentum(gravity), mobj2->scale);
diff --git a/src/p_setup.c b/src/p_setup.c
index 9c1f5bbad..357386482 100644
--- a/src/p_setup.c
+++ b/src/p_setup.c
@@ -8889,7 +8889,7 @@ boolean P_LoadLevel(boolean fromnetsave, boolean reloadinggamestate)
 		Z_Free(bossinfo.subtitle);
 		bossinfo.enemyname = bossinfo.subtitle = NULL;
 		bossinfo.titleshow = 0;
-		bossinfo.titlesound = sfx_typri1;
+		bossinfo.titlesound = sfx_itrol1;
 		memset(&(bossinfo.weakspots), 0, sizeof(weakspot_t)*NUMWEAKSPOTS);
 	}