From b05960431d21e14d0ac9c233d2572330cd5a9689 Mon Sep 17 00:00:00 2001
From: mazmazz <mar.marcoz@outlook.com>
Date: Fri, 10 Aug 2018 03:05:10 -0400
Subject: [PATCH] Reset player->rings on denightserize and on new mare
---
src/p_user.c | 7 ++++---
1 file changed, 4 insertions(+), 3 deletions(-)
diff --git a/src/p_user.c b/src/p_user.c
index 449f95db2c..52b4cd88a0 100644
--- a/src/p_user.c
+++ b/src/p_user.c
@@ -590,8 +590,9 @@ static void P_DeNightserizePlayer(player_t *player)
else if (player == &players[secondarydisplayplayer])
localaiming2 = 0;
- // If you screwed up, kiss your score goodbye.
+ // If you screwed up, kiss your score and ring bonus goodbye.
player->marescore = 0;
+ player->rings = 0;
P_SetPlayerMobjState(player->mo, S_PLAY_FALL);
@@ -721,7 +722,7 @@ void P_NightserizePlayer(player_t *player, INT32 nighttime)
players[i].lastmarescore = players[i].marescore;
players[i].marescore = 0;
- players[i].spheres = 0;
+ players[i].spheres = players[i].rings = 0;
P_DoPlayerExit(&players[i]);
}
}
@@ -745,7 +746,7 @@ void P_NightserizePlayer(player_t *player, INT32 nighttime)
player->marescore = 0;
player->marebegunat = leveltime;
- player->spheres = 0;
+ player->spheres = player->rings = 0;
}
else
{
--
GitLab