From 2c689bae5207babf95c54c0b5091a833ed212e92 Mon Sep 17 00:00:00 2001
From: spherallic <spherallic@gmail.com>
Date: Thu, 4 May 2023 16:17:10 +0200
Subject: [PATCH] 2.2.11
---
appveyor.yml | 2 +-
assets/CMakeLists.txt | 1 +
src/config.h.in | 5 +++--
src/doomdef.h | 2 +-
src/version.h | 2 +-
src/win32/Srb2win.rc | 4 ++--
6 files changed, 9 insertions(+), 7 deletions(-)
diff --git a/appveyor.yml b/appveyor.yml
index 348b727b1d..e3348d35cb 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -1,4 +1,4 @@
-version: 2.2.10.{branch}-{build}
+version: 2.2.11.{branch}-{build}
os: MinGW
environment:
diff --git a/assets/CMakeLists.txt b/assets/CMakeLists.txt
index de164b23f0..dfb2f4180d 100644
--- a/assets/CMakeLists.txt
+++ b/assets/CMakeLists.txt
@@ -29,6 +29,7 @@ set(SRB2_ASSETS_GAME
"srb2.pk3"
"player.dta"
"zones.pk3"
+ "patch.pk3"
"music.dta"
"models.dat"
)
diff --git a/src/config.h.in b/src/config.h.in
index 22cfd64816..3d6d983756 100644
--- a/src/config.h.in
+++ b/src/config.h.in
@@ -27,12 +27,13 @@
* Last updated 2020 / 10 / 02 - v2.2.8 - patch.pk3
* Last updated 2021 / 05 / 06 - v2.2.9 - patch.pk3 & zones.pk3
* Last updated 2022 / 03 / 06 - v2.2.10 - main assets
+ * Last updated 2023 / 05 / 02 - v2.2.11 - patch.pk3 & zones.pk3
*/
#define ASSET_HASH_SRB2_PK3 "ad911f29a28a18968ee5b2d11c2acb39"
-#define ASSET_HASH_ZONES_PK3 "188a2bfd552196609323fc91ec1cdb22"
+#define ASSET_HASH_ZONES_PK3 "1c8adf8d079ecb87d00081f158acf3c7"
#define ASSET_HASH_PLAYER_DTA "2e7aaae8a6b1b77d90ffe7606ceadb6c"
#ifdef USE_PATCH_DTA
-#define ASSET_HASH_PATCH_PK3 "7d467a883f7887b3c311798ee2f56b6a"
+#define ASSET_HASH_PATCH_PK3 "2e69558bce3b9610624549a75e29e19b"
#endif
#endif
diff --git a/src/doomdef.h b/src/doomdef.h
index 3abe271121..d521d4fbbb 100644
--- a/src/doomdef.h
+++ b/src/doomdef.h
@@ -152,7 +152,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 f8b09ada64..083c531343 100644
--- a/src/version.h
+++ b/src/version.h
@@ -12,4 +12,4 @@
#define MODVERSION 52
// Define this as a prerelease version suffix (pre#, RC#)
-#define BETAVERSION "pre3"
+//#define BETAVERSION "pre1"
diff --git a/src/win32/Srb2win.rc b/src/win32/Srb2win.rc
index 07898dbc13..869c0e7d36 100644
--- a/src/win32/Srb2win.rc
+++ b/src/win32/Srb2win.rc
@@ -77,8 +77,8 @@ END
#include "../doomdef.h" // Needed for version string
VS_VERSION_INFO VERSIONINFO
- FILEVERSION 2,2,10,0
- PRODUCTVERSION 2,2,10,0
+ FILEVERSION 2,2,11,0
+ PRODUCTVERSION 2,2,11,0
FILEFLAGSMASK 0x3fL
#ifdef _DEBUG
FILEFLAGS 0x1L
--
GitLab