From 136800ec230535307f01d0220b0b36a7cc69110c Mon Sep 17 00:00:00 2001 From: AJ Martinez Date: Tue, 30 May 2023 03:03:34 -0700 Subject: [PATCH] When hit at -20 rings, die --- src/p_inter.c | 6 ++++++ src/p_user.c | 3 +++ 2 files changed, 9 insertions(+) diff --git a/src/p_inter.c b/src/p_inter.c index cf8333dfb..9e4f32fd8 100644 --- a/src/p_inter.c +++ b/src/p_inter.c @@ -2398,6 +2398,12 @@ boolean P_DamageMobj(mobj_t *target, mobj_t *inflictor, mobj_t *source, INT32 da } } + if (player->rings <= -20) + { + damagetype |= DMG_INSTAKILL; + P_KillPlayer(player, inflictor, source, damagetype); + } + switch (type) { case DMG_STING: diff --git a/src/p_user.c b/src/p_user.c index 3afb5b7bf..21d4782ac 100644 --- a/src/p_user.c +++ b/src/p_user.c @@ -4368,6 +4368,9 @@ void P_PlayerThink(player_t *player) { // Allows some turning P_MovePlayer(player); + + if (player->rings <= -20) // We got here from death, so give the player a fresh start. + player->rings = 5; } } else if (player->mo->reactiontime)