From 96ff6d002dfd3475c2469bab027f07f474ea57be Mon Sep 17 00:00:00 2001 From: Zippy_Zolton Date: Sun, 29 Nov 2020 17:16:57 -0600 Subject: [PATCH 1/5] Make P_DoSuperTransformation (with giverings) add 50 rings instead of setting it --- src/p_user.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/p_user.c b/src/p_user.c index c5f919c78..04c5e1387 100644 --- a/src/p_user.c +++ b/src/p_user.c @@ -1342,7 +1342,7 @@ void P_DoSuperTransformation(player_t *player, boolean giverings) P_SetPlayerMobjState(player->mo, S_PLAY_SUPER_TRANS1); if (giverings) - player->rings = 50; + player->rings += 50; // Just in case. if (!(mapheaderinfo[gamemap-1]->levelflags & LF_NOSSMUSIC)) From 556dd3bfca61f1b2bddb3226c7307d12ade7ddb6 Mon Sep 17 00:00:00 2001 From: Zippy_Zolton Date: Sun, 29 Nov 2020 17:39:54 -0600 Subject: [PATCH 2/5] P_GivePlayerRings --- src/p_user.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/p_user.c b/src/p_user.c index 04c5e1387..166027c8d 100644 --- a/src/p_user.c +++ b/src/p_user.c @@ -1342,7 +1342,7 @@ void P_DoSuperTransformation(player_t *player, boolean giverings) P_SetPlayerMobjState(player->mo, S_PLAY_SUPER_TRANS1); if (giverings) - player->rings += 50; + P_GivePlayerRings(player, 50) // Just in case. if (!(mapheaderinfo[gamemap-1]->levelflags & LF_NOSSMUSIC)) From 8c836971deea9148cad6418806a963c40344c239 Mon Sep 17 00:00:00 2001 From: Zippy_Zolton Date: Mon, 30 Nov 2020 12:04:35 -0600 Subject: [PATCH 3/5] overhaul --- src/p_user.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/p_user.c b/src/p_user.c index 166027c8d..66cce3082 100644 --- a/src/p_user.c +++ b/src/p_user.c @@ -1341,8 +1341,8 @@ void P_DoSuperTransformation(player_t *player, boolean giverings) // Transformation animation P_SetPlayerMobjState(player->mo, S_PLAY_SUPER_TRANS1); - if (giverings) - P_GivePlayerRings(player, 50) + if (giverings) && player->rings > 50 + player->rings = 50 // Just in case. if (!(mapheaderinfo[gamemap-1]->levelflags & LF_NOSSMUSIC)) From 6bfccec3c362ca69b045d73459d6a658b324d40d Mon Sep 17 00:00:00 2001 From: Zippy_Zolton Date: Mon, 30 Nov 2020 12:05:45 -0600 Subject: [PATCH 4/5] oops --- src/p_user.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/p_user.c b/src/p_user.c index 66cce3082..e357c8b5c 100644 --- a/src/p_user.c +++ b/src/p_user.c @@ -1342,7 +1342,7 @@ void P_DoSuperTransformation(player_t *player, boolean giverings) P_SetPlayerMobjState(player->mo, S_PLAY_SUPER_TRANS1); if (giverings) && player->rings > 50 - player->rings = 50 + player->rings = 50; // Just in case. if (!(mapheaderinfo[gamemap-1]->levelflags & LF_NOSSMUSIC)) From 3015ee07ae3c146584e07e1f6ea8b89b5a5f1357 Mon Sep 17 00:00:00 2001 From: Zippy_Zolton Date: Mon, 30 Nov 2020 16:39:24 -0600 Subject: [PATCH 5/5] thanks zap --- src/p_user.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/p_user.c b/src/p_user.c index e357c8b5c..31aadffa6 100644 --- a/src/p_user.c +++ b/src/p_user.c @@ -1341,7 +1341,7 @@ void P_DoSuperTransformation(player_t *player, boolean giverings) // Transformation animation P_SetPlayerMobjState(player->mo, S_PLAY_SUPER_TRANS1); - if (giverings) && player->rings > 50 + if (giverings && player->rings < 50) player->rings = 50; // Just in case.