From 49b27fc1243e1d663032c80f9f0adfd726d8fbd5 Mon Sep 17 00:00:00 2001
From: mazmazz <mar.marcoz@outlook.com>
Date: Fri, 7 Sep 2018 08:19:22 -0400
Subject: [PATCH] Deduct marescore immediately on instakill
* Deduct player->spheres too, missed that one
---
src/p_user.c | 14 +++++++++-----
1 file changed, 9 insertions(+), 5 deletions(-)
diff --git a/src/p_user.c b/src/p_user.c
index e1480a47d1..806fc5da08 100644
--- a/src/p_user.c
+++ b/src/p_user.c
@@ -609,9 +609,9 @@ static void P_DeNightserizePlayer(player_t *player)
stagefailed = true; // NIGHT OVER
// If you screwed up, kiss your score and ring bonus goodbye.
- // But don't do this yet if not in special stage! Wait til we hit the ground.
- player->marescore = 0;
- player->rings = 0;
+ // But only do this in special stage (and instakill!) In regular stages, wait til we hit the ground.
+ player->marescore = player->spheres =\
+ player->rings = 0;
}
// Check to see if the player should be killed.
@@ -625,7 +625,11 @@ static void P_DeNightserizePlayer(player_t *player)
continue;
if (mo2->flags2 & MF2_AMBUSH)
+ {
+ player->marescore = player->spheres =\
+ player->rings = 0;
P_DamageMobj(player->mo, NULL, NULL, 1, DMG_INSTAKILL);
+ }
break;
}
@@ -7083,8 +7087,8 @@ static void P_MovePlayer(player_t *player)
P_DamageMobj(player->mo, NULL, NULL, 1, 0);
// Now deduct our mare score!
- player->marescore = 0;
- player->rings = 0;
+ player->marescore = player->spheres =\
+ player->rings = 0;
}
player->powers[pw_carry] = CR_NONE;
}
--
GitLab