From 64b7a5e4d6d71e53a10e6cefef4ce04993230882 Mon Sep 17 00:00:00 2001
From: James R <justsomejames2@gmail.com>
Date: Wed, 12 Feb 2020 18:03:39 -0800
Subject: [PATCH 1/2] SF_NONIGHTSSUPER for disabling super colors in NiGHTS

---
 src/d_player.h | 1 +
 src/dehacked.c | 1 +
 src/p_user.c   | 2 +-
 src/r_things.c | 1 +
 4 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/src/d_player.h b/src/d_player.h
index db55a9913..250410c3b 100644
--- a/src/d_player.h
+++ b/src/d_player.h
@@ -48,6 +48,7 @@ typedef enum
 	SF_FASTEDGE         = 1<<12, // Faster edge teeter?
 	SF_MULTIABILITY     = 1<<13, // Revenge of Final Demo.
 	SF_NONIGHTSROTATION = 1<<14, // Disable sprite rotation for NiGHTS
+	SF_NONIGHTSSUPER    = 1<<15, // Disable super colors for NiGHTS (if you have SF_SUPER)
 	// free up to and including 1<<31
 } skinflags_t;
 
diff --git a/src/dehacked.c b/src/dehacked.c
index e7ff6e400..e48b1cb90 100644
--- a/src/dehacked.c
+++ b/src/dehacked.c
@@ -9477,6 +9477,7 @@ struct {
 	{"SF_FASTEDGE",SF_FASTEDGE},
 	{"SF_MULTIABILITY",SF_MULTIABILITY},
 	{"SF_NONIGHTSROTATION",SF_NONIGHTSROTATION},
+	{"SF_NONIGHTSSUPER",SF_NONIGHTSSUPER},
 
 	// Dashmode constants
 	{"DASHMODE_THRESHOLD",DASHMODE_THRESHOLD},
diff --git a/src/p_user.c b/src/p_user.c
index 176b07d0a..5b88148d5 100644
--- a/src/p_user.c
+++ b/src/p_user.c
@@ -8040,7 +8040,7 @@ static void P_MovePlayer(player_t *player)
 			&& player->mo->state < &states[S_PLAY_NIGHTS_TRANS6]))) // Note the < instead of <=
 		{
 			skin_t *skin = ((skin_t *)(player->mo->skin));
-			if (skin->flags & SF_SUPER)
+			if (( skin->flags & (SF_SUPER|SF_NONIGHTSSUPER) ) == SF_SUPER)
 			{
 				player->mo->color = skin->supercolor
 					+ ((player->nightstime == player->startedtime)
diff --git a/src/r_things.c b/src/r_things.c
index 7f0f43281..ae4ccb5a8 100644
--- a/src/r_things.c
+++ b/src/r_things.c
@@ -3463,6 +3463,7 @@ static boolean R_ProcessPatchableFields(skin_t *skin, char *stoken, char *value)
 	GETFLAG(DASHMODE)
 	GETFLAG(FASTEDGE)
 	GETFLAG(MULTIABILITY)
+	GETFLAG(NONIGHTSSUPER)
 #undef GETFLAG
 
 	else // let's check if it's a sound, otherwise error out

From 71319dce6b5cd1706c693942877149249e75b494 Mon Sep 17 00:00:00 2001
From: James R <justsomejames2@gmail.com>
Date: Wed, 12 Feb 2020 18:15:15 -0800
Subject: [PATCH 2/2] Revert "Update file hashes"

This reverts commit 4281de3b89e4ace77bff9dca003feb26d9e4dbc5.
---
 src/config.h.in | 8 ++++----
 src/d_main.c    | 2 +-
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/config.h.in b/src/config.h.in
index d4a613fdc..233cbdc53 100644
--- a/src/config.h.in
+++ b/src/config.h.in
@@ -26,12 +26,12 @@
 #else
 
 /* Manually defined asset hashes for non-CMake builds
- * Last updated 2020 / 02 / 09 - v2.2.1 - main assets
+ * Last updated 2019 / 12 / 06 - v2.2.0 - main assets
  * Last updated 20?? / ?? / ?? - v2.2.? - patch.pk3
  */
-#define ASSET_HASH_SRB2_PK3   "0277c9416756627004e83cbb5b2e3e28"
-#define ASSET_HASH_ZONES_PK3  "89627822f5a5c7fb022d836b138144b2"
-#define ASSET_HASH_PLAYER_DTA "129fa7d4b273a4b3dcacaa44eccead4f"
+#define ASSET_HASH_SRB2_PK3   "51419a33b4982d840c6772c159ba7c0a"
+#define ASSET_HASH_ZONES_PK3  "df74843919fd51af26a0baa8e21e4c19"
+#define ASSET_HASH_PLAYER_DTA "56a247e074dd0dc794b6617efef1e918"
 #ifdef USE_PATCH_DTA
 #define ASSET_HASH_PATCH_PK3  "there is no patch.pk3, only zuul"
 #endif
diff --git a/src/d_main.c b/src/d_main.c
index 27f250017..dc9bfbfea 100644
--- a/src/d_main.c
+++ b/src/d_main.c
@@ -1213,7 +1213,7 @@ void D_SRB2Main(void)
 #endif
 	D_CleanFile();
 
-#ifndef DEVELOP // md5s last updated 09/02/20 (ddmmyy)
+#ifndef DEVELOP // md5s last updated 06/12/19 (ddmmyy)
 
 	// Check MD5s of autoloaded files
 	W_VerifyFileMD5(0, ASSET_HASH_SRB2_PK3); // srb2.pk3