From e86dd38e2475f08b1db21a90b6289c1c419d2212 Mon Sep 17 00:00:00 2001 From: Sally Coolatta Date: Mon, 17 Apr 2023 01:03:55 -0400 Subject: [PATCH] Load split textures pk3s --- src/config.h.in | 14 ++++++++------ src/d_main.c | 20 +++++++++++++------- src/d_netfil.c | 3 +++ 3 files changed, 24 insertions(+), 13 deletions(-) diff --git a/src/config.h.in b/src/config.h.in index bf79b61ad..e08d94e12 100644 --- a/src/config.h.in +++ b/src/config.h.in @@ -31,13 +31,15 @@ * Last updated 2020 / 08 / 30 - Kart v1.3 - patch.kart */ -#define ASSET_HASH_MAIN_KART "00000000000000000000000000000000" -#define ASSET_HASH_GFX_PK3 "00000000000000000000000000000000" -#define ASSET_HASH_TEXTURES_PK3 "00000000000000000000000000000000" -#define ASSET_HASH_CHARS_PK3 "00000000000000000000000000000000" -#define ASSET_HASH_MAPS_PK3 "00000000000000000000000000000000" +#define ASSET_HASH_MAIN_KART "00000000000000000000000000000000" +#define ASSET_HASH_GFX_PK3 "00000000000000000000000000000000" +#define ASSET_HASH_TEXTURES_GENERAL_PK3 "00000000000000000000000000000000" +#define ASSET_HASH_TEXTURES_SEGA_PK3 "00000000000000000000000000000000" +#define ASSET_HASH_TEXTURES_ORIGINAL_PK3 "00000000000000000000000000000000" +#define ASSET_HASH_CHARS_PK3 "00000000000000000000000000000000" +#define ASSET_HASH_MAPS_PK3 "00000000000000000000000000000000" #ifdef USE_PATCH_FILE -#define ASSET_HASH_PATCH_PK3 "00000000000000000000000000000000" +#define ASSET_HASH_PATCH_PK3 "00000000000000000000000000000000" #endif #endif diff --git a/src/d_main.c b/src/d_main.c index ee53759dc..582399f82 100644 --- a/src/d_main.c +++ b/src/d_main.c @@ -1192,7 +1192,9 @@ static void IdentifyVersion(void) D_AddFile(startupiwads, va(pandf,srb2waddir,"scripts.pk3")); #endif D_AddFile(startupiwads, va(pandf,srb2waddir,"gfx.pk3")); - D_AddFile(startupiwads, va(pandf,srb2waddir,"textures.pk3")); + D_AddFile(startupiwads, va(pandf,srb2waddir,"textures_general.pk3")); + D_AddFile(startupiwads, va(pandf,srb2waddir,"textures_segazones.pk3")); + D_AddFile(startupiwads, va(pandf,srb2waddir,"textures_originalzones.pk3")); D_AddFile(startupiwads, va(pandf,srb2waddir,"chars.pk3")); D_AddFile(startupiwads, va(pandf,srb2waddir,"maps.pk3")); D_AddFile(startupiwads, va(pandf,srb2waddir,"followers.pk3")); @@ -1523,18 +1525,22 @@ void D_SRB2Main(void) #endif // Check MD5s of autoloaded files // Note: Do not add any files that ignore MD5! - W_VerifyFileMD5(mainwads, ASSET_HASH_MAIN_KART); // main.kart - mainwads++; W_VerifyFileMD5(mainwads, ASSET_HASH_GFX_PK3); // gfx.pk3 - mainwads++; W_VerifyFileMD5(mainwads, ASSET_HASH_TEXTURES_PK3); // textures.pk3 - mainwads++; W_VerifyFileMD5(mainwads, ASSET_HASH_CHARS_PK3); // chars.pk3 - mainwads++; W_VerifyFileMD5(mainwads, ASSET_HASH_MAPS_PK3); // maps.pk3 -- 4 - If you touch this, make sure to touch up the majormods stuff below. + W_VerifyFileMD5(mainwads, ASSET_HASH_MAIN_KART); // main.kart + mainwads++; W_VerifyFileMD5(mainwads, ASSET_HASH_GFX_PK3); // gfx.pk3 + mainwads++; W_VerifyFileMD5(mainwads, ASSET_HASH_TEXTURES_GENERAL_PK3); // textures_general.pk3 + mainwads++; W_VerifyFileMD5(mainwads, ASSET_HASH_TEXTURES_SEGA // textures_segazones.pk3 + mainwads++; W_VerifyFileMD5(mainwads, ASSET_HASH_TEXTURES_ORIGINAL_PK3); // textures_originalzones.pk3 + mainwads++; W_VerifyFileMD5(mainwads, ASSET_HASH_CHARS_PK3); // chars.pk3 + mainwads++; W_VerifyFileMD5(mainwads, ASSET_HASH_MAPS_PK3); // maps.pk3 mainwads++; W_VerifyFileMd5(mainwads, ASSET_HASH_FOLLOWERS_PK3); // followers.pk3 #else #ifdef USE_PATCH_FILE mainwads++; // scripts.pk3 #endif mainwads++; // gfx.pk3 - mainwads++; // textures.pk3 + mainwads++; // textures_general.pk3 + mainwads++; // textures_originalzones.pk3 + mainwads++; // textures_uniquezones.pk3 mainwads++; // chars.pk3 mainwads++; // maps.pk3 mainwads++; // followers.pk3 diff --git a/src/d_netfil.c b/src/d_netfil.c index 93d7e8eba..916dd75be 100644 --- a/src/d_netfil.c +++ b/src/d_netfil.c @@ -1429,6 +1429,9 @@ void PT_FileFragment(void) if (!strcmp(filename, "main.kart") || !strcmp(filename, "gfx.pk3") || !strcmp(filename, "textures.pk3") + || !strcmp(filename, "textures_general.pk3") + || !strcmp(filename, "textures_segazones.pk3") + || !strcmp(filename, "textures_originalzones.pk3") || !strcmp(filename, "chars.pk3") || !strcmp(filename, "maps.pk3") || !strcmp(filename, "patch.pk3")