From 39ca58d0a427c5444f4bde021b910c89bdff3acb Mon Sep 17 00:00:00 2001
From: TehRealSalt <tehrealsalt@gmail.com>
Date: Wed, 17 Oct 2018 20:30:34 -0400
Subject: [PATCH] Add more hash stuff
UNFINISHED, still need to add in legitimate hashes for non-CMake builds when we've finalized the content.
---
assets/CMakeLists.txt | 7 ++++---
src/config.h.in | 26 +++++++++++++++++++-------
src/d_main.c | 4 ++--
3 files changed, 25 insertions(+), 12 deletions(-)
diff --git a/assets/CMakeLists.txt b/assets/CMakeLists.txt
index 764415976..dae68cf75 100644
--- a/assets/CMakeLists.txt
+++ b/assets/CMakeLists.txt
@@ -3,8 +3,9 @@
# MD5 generation
set(SRB2_ASSET_ALL
${CMAKE_CURRENT_SOURCE_DIR}/srb2.srb
- ${CMAKE_CURRENT_SOURCE_DIR}/chars.kart
+ ${CMAKE_CURRENT_SOURCE_DIR}/patch.dta
${CMAKE_CURRENT_SOURCE_DIR}/gfx.kart
+ ${CMAKE_CURRENT_SOURCE_DIR}/chars.kart
${CMAKE_CURRENT_SOURCE_DIR}/maps.kart
${CMAKE_CURRENT_SOURCE_DIR}/sounds.kart
${CMAKE_CURRENT_SOURCE_DIR}/music.dta
@@ -13,10 +14,10 @@ set(SRB2_ASSET_ALL
set(SRB2_ASSET_HASHED
srb2.srb
- chars.kart
+ patch.dta
gfx.kart
+ chars.kart
maps.kart
- sounds.kart
)
foreach(SRB2_ASSET ${SRB2_ASSET_HASHED})
diff --git a/src/config.h.in b/src/config.h.in
index 22a0dfa01..68c29782d 100644
--- a/src/config.h.in
+++ b/src/config.h.in
@@ -11,14 +11,20 @@
#ifdef CMAKECONFIG
+// Base SRB2 hashes
#define ASSET_HASH_SRB2_SRB "${SRB2_ASSET_srb2.srb_HASH}"
-#define ASSET_HASH_PLAYER_DTA "${SRB2_ASSET_player.dta_HASH}"
-#define ASSET_HASH_RINGS_DTA "${SRB2_ASSET_rings.dta_HASH}"
-#define ASSET_HASH_ZONES_DTA "${SRB2_ASSET_zones.dta_HASH}"
#ifdef USE_PATCH_DTA
#define ASSET_HASH_PATCH_DTA "${SRB2_ASSET_patch.dta_HASH}"
#endif
+// SRB2Kart-specific hashes
+#define ASSET_HASH_GFX_KART "${SRB2_ASSET_gfx.kart_HASH}"
+#define ASSET_HASH_CHARS_KART "${SRB2_ASSET_chars.kart_HASH}"
+#define ASSET_HASH_MAPS_KART "${SRB2_ASSET_maps.kart_HASH}"
+#ifdef USE_PATCH_KART
+#define ASSET_HASH_PATCH_KART "${SRB2_ASSET_patch.kart_HASH}"
+#endif
+
#define SRB2_COMP_REVISION "${SRB2_COMP_REVISION}"
#define SRB2_COMP_BRANCH "${SRB2_COMP_BRANCH}"
#define SRB2_GIT_DESCRIBE "${SRB2_GIT_DESCRIBE}"
@@ -32,14 +38,20 @@
* YYYY MM DD
* Last updated 2017 / 02 / 20
*/
-#define ASSET_HASH_SRB2_SRB "c1b9577687f8a795104aef4600720ea7"
-#define ASSET_HASH_GFX_DTA "ff653bb9c0dcb685fb7c1c5880bcaff1"
-#define ASSET_HASH_CHARS_DTA "24c2641472bc187980eedc3c86691863"
-#define ASSET_HASH_MAPS_DTA "13db5d4427f568f1c8f0599f2d14a7aa"
+// Base SRB2 hashes
+#define ASSET_HASH_SRB2_SRB "c1b9577687f8a795104aef4600720ea7"
#ifdef USE_PATCH_DTA
#define ASSET_HASH_PATCH_DTA "dbbf8bc6121618ee3be2d5b14650429b"
#endif
+// SRB2Kart-specific hashes
+#define ASSET_HASH_GFX_KART "00000000000000000000000000000000"
+#define ASSET_HASH_CHARS_KART "00000000000000000000000000000000"
+#define ASSET_HASH_MAPS_KART "00000000000000000000000000000000"
+#ifdef USE_PATCH_KART
+#define ASSET_HASH_PATCH_KART "00000000000000000000000000000000"
+#endif
+
#endif
#endif
diff --git a/src/d_main.c b/src/d_main.c
index e56a631a2..e5fe67f13 100644
--- a/src/d_main.c
+++ b/src/d_main.c
@@ -1263,9 +1263,9 @@ void D_SRB2Main(void)
#ifdef USE_PATCH_DTA
mainwads++; // patch.dta
#endif
- mainwads++; // gfx.kart
+ mainwads++; // gfx.kart
mainwads++; // chars.kart
- mainwads++; // maps.kart
+ mainwads++; // maps.kart
mainwads++; // sounds.kart
#ifdef USE_PATCH_KART
mainwads++; // patch.kart
--
GitLab