From 80d66ca20bb970bf49e300b030627e833f82677e Mon Sep 17 00:00:00 2001
From: spherallic <spherallic@gmail.com>
Date: Sun, 5 Dec 2021 18:39:12 +0100
Subject: [PATCH] 2.2.10 pre-release 1

---
 src/config.h.in      | 7 ++++---
 src/d_main.c         | 5 +----
 src/doomdef.h        | 2 +-
 src/version.h        | 4 ++--
 src/win32/Srb2win.rc | 4 ++--
 5 files changed, 10 insertions(+), 12 deletions(-)

diff --git a/src/config.h.in b/src/config.h.in
index db794cccc..8b5193442 100644
--- a/src/config.h.in
+++ b/src/config.h.in
@@ -35,10 +35,11 @@
  * Last updated 2020 / 09 / 27 - v2.2.7 - patch.pk3
  * Last updated 2020 / 10 / 02 - v2.2.8 - patch.pk3
  * Last updated 2021 / 05 / 06 - v2.2.9 - patch.pk3 & zones.pk3
+ * Last updated 2021 / 12 / 05 - v2.2.10 - main assets
  */
-#define ASSET_HASH_SRB2_PK3   "0277c9416756627004e83cbb5b2e3e28"
-#define ASSET_HASH_ZONES_PK3  "f8f3e2b5deacf40f14e36686a07d44bb"
-#define ASSET_HASH_PLAYER_DTA "49dad7b24634c89728cc3e0b689e12bb"
+#define ASSET_HASH_SRB2_PK3   "e8c6dac1bf25effe6b03a824f12c182e"
+#define ASSET_HASH_ZONES_PK3  "d809d44947e0e6aac9fc338c213986ec"
+#define ASSET_HASH_PLAYER_DTA "2e7aaae8a6b1b77d90ffe7606ceadb6c"
 #ifdef USE_PATCH_DTA
 #define ASSET_HASH_PATCH_PK3  "7d467a883f7887b3c311798ee2f56b6a"
 #endif
diff --git a/src/d_main.c b/src/d_main.c
index 83419d266..4b4220559 100644
--- a/src/d_main.c
+++ b/src/d_main.c
@@ -1102,10 +1102,7 @@ static void IdentifyVersion(void)
 		}
 
 		MUSICTEST("music.dta")
-		MUSICTEST("patch_music.pk3")
-#ifdef DEVELOP // remove when music_new.dta is merged into music.dta
-		MUSICTEST("music_new.dta")
-#endif
+		//MUSICTEST("patch_music.pk3")
 	}
 #endif
 }
diff --git a/src/doomdef.h b/src/doomdef.h
index 7e7e35599..866f42efe 100644
--- a/src/doomdef.h
+++ b/src/doomdef.h
@@ -150,7 +150,7 @@ extern char logfilename[1024];
 
 // Does this version require an added patch file?
 // Comment or uncomment this as necessary.
-#define USE_PATCH_DTA
+// #define USE_PATCH_DTA
 
 // Enforce a limit of loaded WAD files.
 //#define ENFORCE_WAD_LIMIT
diff --git a/src/version.h b/src/version.h
index 28fc71c36..b6407ed8f 100644
--- a/src/version.h
+++ b/src/version.h
@@ -1,4 +1,4 @@
-#define SRB2VERSION "2.2.9"/* this must be the first line, for cmake !! */
+#define SRB2VERSION "2.2.10"/* this must be the first line, for cmake !! */
 
 // The Modification ID; must be obtained from a Master Server Admin ( https://mb.srb2.org/members/?key=ms_admin ).
 // DO NOT try to set this otherwise, or your modification will be unplayable through the Master Server.
@@ -12,4 +12,4 @@
 #define MODVERSION 50
 
 // Define this as a prerelease version suffix
-// #define BETAVERSION "RC1"
+#define BETAVERSION "pre1"
diff --git a/src/win32/Srb2win.rc b/src/win32/Srb2win.rc
index 0a280448b..dea7a9e1e 100644
--- a/src/win32/Srb2win.rc
+++ b/src/win32/Srb2win.rc
@@ -76,8 +76,8 @@ END
 #include "../doomdef.h" // Needed for version string
 
 VS_VERSION_INFO VERSIONINFO
- FILEVERSION 2,2,9,0
- PRODUCTVERSION 2,2,9,0
+ FILEVERSION 2,2,10,0
+ PRODUCTVERSION 2,2,10,0
  FILEFLAGSMASK 0x3fL
 #ifdef _DEBUG
  FILEFLAGS 0x1L