Move Hashes and filename

src/config.h.in

@@ -9,23 +9,6 @@
  * variables, so you can insert them here too.
  */
 
-/* Manually defined asset hashes
- * Last updated 2019 / 01 / 18 - Kart v1.0.2 - Main assets
- * Last updated 2020 / 08 / 30 - Kart v1.3 - patch.kart
- * updated 2025 - BlanKart Indev -
- */
-
-#define ASSET_HASH_MAIN_PK3     "daf9a1a67b5e465c13789e96a09f7171"
-#define ASSET_HASH_SRB2_SRB     "c1b9577687f8a795104aef4600720ea7"
-#define ASSET_HASH_GFX_KART       "06f86ee16136eb8a7043b15001797034"
-#define ASSET_HASH_TEXTURES_KART  "abb53d56aba47c3a8cb0f764da1c8b80"
-#define ASSET_HASH_CHARS_KART     "e2c428347dde52858a3dacd29fc5b964"
-#define ASSET_HASH_MAPS_KART      "d051e55141ba736582228c456953cd98"
-#define ASSET_HASH_FOLLOWERS_PK3 "00000000000000000000000000000000"
-#ifdef USE_PATCH_FILE
-#define ASSET_HASH_PATCH_PK3     "00000000000000000000000000000000"
-#endif
-
 #ifdef CMAKECONFIG
 
 #define SRB2_COMP_REVISION       "${SRB2_COMP_REVISION}"

src/d_main.cpp

@@ -80,6 +80,17 @@
 
 #include <tracy/tracy/Tracy.hpp>
 
+// Put hashes here to get them out of header hell.
+#define ASSET_HASH_MAIN_PK3     "00000000000000000000000000000000"
+#define ASSET_HASH_SRB2_SRB     "c1b9577687f8a795104aef4600720ea7"
+#define ASSET_HASH_GFX_KART       "06f86ee16136eb8a7043b15001797034"
+#define ASSET_HASH_TEXTURES_KART  "abb53d56aba47c3a8cb0f764da1c8b80"
+#define ASSET_HASH_CHARS_KART     "e2c428347dde52858a3dacd29fc5b964"
+#define ASSET_HASH_MAPS_KART      "d051e55141ba736582228c456953cd98"
+#ifdef USE_PATCH_FILE
+#define ASSET_HASH_PATCH_PK3     "00000000000000000000000000000000"
+#endif
+
 #ifdef CMAKECONFIG
 #include "config.h"
 #else
@@ -1132,7 +1143,7 @@ static void ChangeDirForUrlHandler(void)
 
 static boolean AddIWAD(void)
 {
-	char * path = va(pandf,srb2path,"srb2.srb");
+	char * path = va(pandf,srb2path, SRB2NAME);
 
 	if (FIL_ReadFileOK(path))
 	{
@@ -1170,7 +1181,7 @@ static void IdentifyVersion(void)
 	// Load the IWAD
 	if (! AddIWAD())
 	{
-		I_Error("srb2.srb not found! Expected in %s\n", srb2waddir);
+		I_Error("%s not found! Expected in %s\n", SRB2NAME, srb2waddir);
 	}
 
 	// will be overwritten in case of -cdrom or unix/win home
@@ -1180,33 +1191,15 @@ static void IdentifyVersion(void)
 	// if you change the ordering of this or add/remove a file, be sure to update the md5
 	// checking in D_SRB2Main
 
-#define MAINNAME "main.pk3"
-#define TEXTURESNAME "textures.kart"
-#define MAPSNAME "maps.kart"
-#define PATCHNAME "patch.pk3"
-#define MUSICNAME "music.kart"
-#define FOLLOWERSNAME "followers.pk3"
-#define CHARSNAME "chars.kart"
-#define GRAPHICSNAME "gfx.kart"
-#define SOUNDSNAME "sounds.kart"
-
 	D_AddFile(startupiwads, va(pandf,srb2waddir,GRAPHICSNAME));
 	D_AddFile(startupiwads, va(pandf,srb2waddir,TEXTURESNAME));
 	D_AddFile(startupiwads, va(pandf,srb2waddir,CHARSNAME));
 	D_AddFile(startupiwads, va(pandf,srb2waddir,MAPSNAME));
 	D_AddFile(startupiwads, va(pandf,srb2waddir,MAINNAME));
-	//D_AddFile(startupiwads, va(pandf,srb2waddir,FOLLOWERSNAME));
 #ifdef USE_PATCH_FILE
 	D_AddFile(startupiwads, va(pandf,srb2waddir,PATCHNAME));
 #endif
 ////
-#undef MAINNAME
-#undef TEXTURESNAME
-#undef MAPSNAME
-#undef PATCHNAME
-#undef FOLLOWERSNAME
-#undef CHARSNAME
-#undef GRAPHICSNAME
 
 #if !defined (HAVE_SDL) || defined (HAVE_MIXER)
 
@@ -1223,10 +1216,7 @@ static void IdentifyVersion(void)
 	MUSICTEST(SOUNDSNAME)
 	MUSICTEST(MUSICNAME)
 
-#undef MUSICNAME
 #undef MUSICTEST
-#undef SOUNDSNAME
-
 
 #endif
 }
@@ -1482,7 +1472,6 @@ void D_SRB2Main(void)
 	mainwads++; W_VerifyFileMD5(mainwads, ASSET_HASH_MAPS_KART);		// maps.kart
 	wadfiles[mainwads]->compatmode = true;
 	mainwads++; W_VerifyFileMD5(mainwads, ASSET_HASH_MAIN_PK3);			// main.pk3
-	//mainwads++; W_VerifyFileMD5(mainwads, ASSET_HASH_FOLLOWERS_PK3);  // followers.pk3
 #ifdef USE_PATCH_FILE
 	mainwads++; W_VerifyFileMD5(mainwads, ASSET_HASH_PATCH_PK3);		// patch.pk3
 #endif
@@ -1496,7 +1485,6 @@ void D_SRB2Main(void)
 	mainwads++;	// maps.kart
 	wadfiles[mainwads]->compatmode = true;
 	mainwads++;	// main.pk3
-	//mainwads++; // followers.pk3
 #ifdef USE_PATCH_FILE
 	mainwads++;	// patch.pk3
 #endif

src/d_main.h

@@ -21,6 +21,17 @@
 extern "C" {
 #endif
 
+// Store file nameres here for future reference else where.
+#define MAINNAME "main.pk3"
+#define SRB2NAME "srb2.srb"
+#define TEXTURESNAME "textures.kart"
+#define MAPSNAME "maps.kart"
+#define PATCHNAME "patch.pk3"
+#define MUSICNAME "music.kart"
+#define CHARSNAME "chars.kart"
+#define GRAPHICSNAME "gfx.kart"
+#define SOUNDSNAME "sounds.kart"
+
 // make sure not to write back the config until it's been correctly loaded
 extern tic_t rendergametic;
 

src/d_netfil.c

@@ -1410,15 +1410,15 @@ void PT_FileFragment(void)
 	filename = va("%s", file->filename);
 	nameonly(filename);
 
-	if (!strcmp(filename, "main.pk3")
-		|| !strcmp(filename, "srb2.srb")
-		|| !strcmp(filename, "gfx.kart")
-		|| !strcmp(filename, "textures.kart")
-		|| !strcmp(filename, "chars.kart")
-		|| !strcmp(filename, "maps.kart")
-		|| !strcmp(filename, "patch.pk3")
-		|| !strcmp(filename, "sounds.kart")
-		|| !strcmp(filename, "music.kart")
+	if (!strcmp(filename, MAINNAME)
+		|| !strcmp(filename, SRB2NAME)
+		|| !strcmp(filename, GRAPHICSNAME)
+		|| !strcmp(filename, TEXTURESNAME)
+		|| !strcmp(filename, CHARSNAME)
+		|| !strcmp(filename, MAPSNAME)
+		|| !strcmp(filename, PATCHNAME)
+		|| !strcmp(filename, SOUNDSNAME)
+		|| !strcmp(filename, MUSICNAME)
 		)
 	{
 		I_Error("Tried to download \"%s\"", filename);

src/doomdef.h

@@ -101,7 +101,7 @@
 extern "C" {
 #endif
 
-#define NOMD5
+//#define NOMD5
 
 // Uncheck this to compile debugging code
 //#define RANGECHECK