From 19cd35a10faec19776b5f6d918856def8bf83860 Mon Sep 17 00:00:00 2001 From: James R Date: Tue, 14 Nov 2023 20:33:09 -0800 Subject: [PATCH] P_DamageMobj: do not spill rings if player has shield --- src/p_inter.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/src/p_inter.c b/src/p_inter.c index 1357af345..8ceee836f 100644 --- a/src/p_inter.c +++ b/src/p_inter.c @@ -3173,6 +3173,12 @@ boolean P_DamageMobj(mobj_t *target, mobj_t *inflictor, mobj_t *source, INT32 da break; } + // Have a shield? You get hit, but don't lose your rings! + if (player->curshield != KSHIELD_NONE) + { + ringburst = 0; + } + if (type != DMG_STUMBLE && type != DMG_WHUMBLE) { if (type != DMG_STING)