From 8ec0865170353bdf2f0cbd0b51c0b3077a2ee9dd Mon Sep 17 00:00:00 2001
From: mazmazz <mar.marcoz@outlook.com>
Date: Sun, 12 Aug 2018 20:25:35 -0400
Subject: [PATCH 1/2] Have just one NiGHTS bonus option: NIGHTS and LINK
 together

---
 src/dehacked.c |  4 +---
 src/y_inter.c  | 14 +-------------
 2 files changed, 2 insertions(+), 16 deletions(-)

diff --git a/src/dehacked.c b/src/dehacked.c
index 41d41405c..70a19eadc 100644
--- a/src/dehacked.c
+++ b/src/dehacked.c
@@ -1197,10 +1197,8 @@ static void readlevelheader(MYFILE *f, INT32 num)
 				else if (fastcmp(word2, "BOSS"))   i =  1;
 				else if (fastcmp(word2, "ERZ3"))   i =  2;
 				else if (fastcmp(word2, "NIGHTS")) i =  3;
-				else if (fastcmp(word2, "NIGHTSLINK")) i =  4;
-				else if (fastcmp(word2, "NIGHTSALL")) i =  5;
 
-				if (i >= -1 && i <= 5) // -1 for no bonus. Max is 2.
+				if (i >= -1 && i <= 3) // -1 for no bonus. Max is 3.
 					mapheaderinfo[num-1]->bonustype = (SINT8)i;
 				else
 					deh_warning("Level header %d: invalid bonus type number %d", num, i);
diff --git a/src/y_inter.c b/src/y_inter.c
index de0335523..2cafed8ca 100644
--- a/src/y_inter.c
+++ b/src/y_inter.c
@@ -1825,7 +1825,7 @@ static void Y_SetPerfectBonus(player_t *player, y_bonus_t *bstruct)
 
 // This list can be extended in the future with SOC/Lua, perhaps.
 typedef void (*bonus_f)(player_t *, y_bonus_t *);
-bonus_f bonuses_list[7][4] = {
+bonus_f bonuses_list[5][4] = {
 	{
 		Y_SetNullBonus,
 		Y_SetNullBonus,
@@ -1850,18 +1850,6 @@ bonus_f bonuses_list[7][4] = {
 		Y_SetRingBonus,
 		Y_SetPerfectBonus,
 	},
-	{
-		Y_SetNullBonus,
-		Y_SetNullBonus,
-		Y_SetNightsBonus,
-		Y_SetNullBonus,
-	},
-	{
-		Y_SetNullBonus,
-		Y_SetNullBonus,
-		Y_SetLinkBonus,
-		Y_SetNullBonus,
-	},
 	{
 		Y_SetNullBonus,
 		Y_SetNightsBonus,

From 83d3099fe3313c378b2732a7142664e01f2232bb Mon Sep 17 00:00:00 2001
From: mazmazz <mar.marcoz@outlook.com>
Date: Sun, 12 Aug 2018 20:36:53 -0400
Subject: [PATCH 2/2] Change special stage bonus to NiGHTS in-level score, per
 MB

---
 src/y_inter.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/y_inter.c b/src/y_inter.c
index 2cafed8ca..915d6b810 100644
--- a/src/y_inter.c
+++ b/src/y_inter.c
@@ -1930,7 +1930,7 @@ static void Y_AwardSpecialStageBonus(void)
 		if (!playeringame[i] || players[i].lives < 1) // not active or game over
 			Y_SetNullBonus(&players[i], &localbonus);
 		else if (maptol & TOL_NIGHTS) // Link instead of Rings
-			Y_SetLinkBonus(&players[i], &localbonus);
+			Y_SetNightsBonus(&players[i], &localbonus);
 		else
 			Y_SetRingBonus(&players[i], &localbonus);
 		players[i].score += localbonus.points;