From 03e38e9486b6639b5f399fe3b30dccdfa89edcf6 Mon Sep 17 00:00:00 2001
From: Steel Titanium <steeltitanium1@gmail.com>
Date: Sat, 22 Feb 2020 16:42:24 -0500
Subject: [PATCH] Enable use of the patch file
---
assets/CMakeLists.txt | 3 ++-
src/config.h.in | 4 ++--
src/d_main.c | 4 ++--
src/doomdef.h | 2 +-
4 files changed, 7 insertions(+), 6 deletions(-)
diff --git a/assets/CMakeLists.txt b/assets/CMakeLists.txt
index 0636c1e599..095349418e 100644
--- a/assets/CMakeLists.txt
+++ b/assets/CMakeLists.txt
@@ -19,7 +19,8 @@ set(SRB2_ASSET_DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}/installer"
set(SRB2_ASSET_HASHED
"srb2.pk3;\
player.dta;\
-zones.pk3"
+zones.pk3;\
+patch.pk3"
CACHE STRING "Asset filenames to apply MD5 checks. No spaces between entries!"
)
diff --git a/src/config.h.in b/src/config.h.in
index 498f3086d3..4926f9a063 100644
--- a/src/config.h.in
+++ b/src/config.h.in
@@ -27,13 +27,13 @@
/* Manually defined asset hashes for non-CMake builds
* Last updated 2020 / 02 / 15 - v2.2.1 - main assets
- * Last updated 20?? / ?? / ?? - v2.2.? - patch.pk3
+ * Last updated 2020 / 02 / 22 - v2.2.2 - patch.pk3
*/
#define ASSET_HASH_SRB2_PK3 "0277c9416756627004e83cbb5b2e3e28"
#define ASSET_HASH_ZONES_PK3 "f7e88afb6af7996a834c7d663144bead"
#define ASSET_HASH_PLAYER_DTA "ad49e07b17cc662f1ad70c454910b4ae"
#ifdef USE_PATCH_DTA
-#define ASSET_HASH_PATCH_PK3 "there is no patch.pk3, only zuul"
+#define ASSET_HASH_PATCH_PK3 "ee54330ecb743314c5f962af4db731ff"
#endif
#endif
diff --git a/src/d_main.c b/src/d_main.c
index d43d57b0bd..904ab3bf13 100644
--- a/src/d_main.c
+++ b/src/d_main.c
@@ -1215,14 +1215,14 @@ void D_SRB2Main(void)
W_InitMultipleFiles(startupwadfiles, mainwads);
D_CleanFile();
-#ifndef DEVELOP // md5s last updated 16/02/20 (ddmmyy)
+#ifndef DEVELOP // md5s last updated 22/02/20 (ddmmyy)
// Check MD5s of autoloaded files
W_VerifyFileMD5(0, ASSET_HASH_SRB2_PK3); // srb2.pk3
W_VerifyFileMD5(1, ASSET_HASH_ZONES_PK3); // zones.pk3
W_VerifyFileMD5(2, ASSET_HASH_PLAYER_DTA); // player.dta
#ifdef USE_PATCH_DTA
- W_VerifyFileMD5(3, ASSET_HASH_PATCH_DTA); // patch.pk3
+ W_VerifyFileMD5(3, ASSET_HASH_PATCH_PK3); // patch.pk3
#endif
// don't check music.dta because people like to modify it, and it doesn't matter if they do
// ...except it does if they slip maps in there, and that's what W_VerifyNMUSlumps is for.
diff --git a/src/doomdef.h b/src/doomdef.h
index b5313d479a..71c8850192 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
// Use .kart extension addons
//#define USE_KART
--
GitLab