From e710d13ef1831206883956931588a26a9d7c39c7 Mon Sep 17 00:00:00 2001 From: toaster Date: Thu, 2 Feb 2023 22:03:59 +0000 Subject: [PATCH 1/3] P_ConvertBinarySectorTypes: Stumble is now binary sector type 11 Was 9, but conflicted with Ring Drain --- src/p_setup.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/p_setup.c b/src/p_setup.c index e10f18a29..7a9b8d03b 100644 --- a/src/p_setup.c +++ b/src/p_setup.c @@ -6017,7 +6017,9 @@ static void P_ConvertBinarySectorTypes(void) case 8: //Instakill sectors[i].damagetype = SD_INSTAKILL; break; - case 9: // Stumble + //case 9: -- Ring Drainer (Floor Touch) + //case 10: -- Ring Drainer (No Floor Touch) + case 11: // Stumble sectors[i].damagetype = SD_STUMBLE; break; case 12: //Wall sector From 057b46f4bd211167ec8d366c3d0cad41500b97b7 Mon Sep 17 00:00:00 2001 From: toaster Date: Thu, 2 Feb 2023 22:18:28 +0000 Subject: [PATCH 2/3] P_DamageMobj: DMG_STUMBLE should not drop shields --- src/p_inter.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/p_inter.c b/src/p_inter.c index c1bcb5b8e..fbd6a2b5e 100644 --- a/src/p_inter.c +++ b/src/p_inter.c @@ -2356,7 +2356,7 @@ boolean P_DamageMobj(mobj_t *target, mobj_t *inflictor, mobj_t *source, INT32 da } else { - K_DropHnextList(player, false); + K_DropHnextList(player, (type != DMG_STUMBLE)); } if (type != DMG_STUMBLE) From 9bf5328d5555c633f9d63635c4e1dc2e06442d1c Mon Sep 17 00:00:00 2001 From: toaster Date: Thu, 2 Feb 2023 22:19:22 +0000 Subject: [PATCH 3/3] P_DamageMobj: Fix DMG_STING not playing sound --- src/p_inter.c | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/src/p_inter.c b/src/p_inter.c index fbd6a2b5e..b6a864a0d 100644 --- a/src/p_inter.c +++ b/src/p_inter.c @@ -2337,13 +2337,11 @@ boolean P_DamageMobj(mobj_t *target, mobj_t *inflictor, mobj_t *source, INT32 da break; } - if (type != DMG_STING && type != DMG_STUMBLE) + if (type != DMG_STUMBLE) { - player->flashing = K_GetKartFlashing(player); - } + if (type != DMG_STING) + player->flashing = K_GetKartFlashing(player); - if (ringburst > 0) - { P_PlayRinglossSound(target); P_PlayerRingBurst(player, ringburst); }