From 8a348794a3cd581eaa44ce01824fb7a2c8fa063d Mon Sep 17 00:00:00 2001 From: mazmazz Date: Wed, 15 Aug 2018 13:49:03 -0400 Subject: [PATCH] Fix issue where capsule immediately re-triggers if player gains rings during destruct --- src/p_user.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/p_user.c b/src/p_user.c index 11d1681ba..98b35ab4c 100644 --- a/src/p_user.c +++ b/src/p_user.c @@ -6046,6 +6046,10 @@ static void P_DoNiGHTSCapsule(player_t *player) if (player->capsule->health > sphereresult) player->capsule->health = sphereresult; + // did player somehow get more spheres? deduct that too + if (player->spheres > 0) + player->capsule->health -= player->spheres; + if (player->capsule->health <= 0) { player->capsule->flags &= ~MF_NOGRAVITY;