diff --git a/assets/CMakeLists.txt b/assets/CMakeLists.txt index 68ff0fdf9..881153682 100644 --- a/assets/CMakeLists.txt +++ b/assets/CMakeLists.txt @@ -13,11 +13,10 @@ set(SRB2_ASSET_DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}/installer" CACHE STRING "Path to directory that contains all asset files for the installer.") set(SRB2_ASSET_HASHED -"srb2.srb;\ +"srb2.pk3;\ player.dta;\ -rings.dta;\ -zones.dta;\ -patch.dta" +zones.pk3;\ +patch.pk3" CACHE STRING "Asset filenames to apply MD5 checks. No spaces between entries!" ) diff --git a/src/Makefile b/src/Makefile index 3015aa5d6..8e9e1816d 100644 --- a/src/Makefile +++ b/src/Makefile @@ -86,10 +86,7 @@ D_DIR?=../bin/Resources D_FILES=$(D_DIR)/srb2.pk3 \ $(D_DIR)/player.dta \ - $(D_DIR)/rings.wpn \ - $(D_DIR)/drill.dta \ - $(D_DIR)/soar.dta \ - $(D_DIR)/zones.dta \ + $(D_DIR)/zones.pk3 \ $(D_DIR)/music.dta \ PKG_CONFIG?=pkg-config diff --git a/src/config.h.in b/src/config.h.in index fc32aef82..58d07e26d 100644 --- a/src/config.h.in +++ b/src/config.h.in @@ -13,7 +13,7 @@ #define ASSET_HASH_SRB2_PK3 "${SRB2_ASSET_srb2.pk3_HASH}" #define ASSET_HASH_PLAYER_DTA "${SRB2_ASSET_player.dta_HASH}" -#define ASSET_HASH_ZONES_DTA "${SRB2_ASSET_zones.dta_HASH}" +#define ASSET_HASH_ZONES_PK3 "${SRB2_ASSET_zones.pk3_HASH}" #ifdef USE_PATCH_DTA #define ASSET_HASH_PATCH_PK3 "${SRB2_ASSET_patch.pk3_HASH}" #endif @@ -30,7 +30,7 @@ * Last updated 2018 / ?? / ?? - v2.2 - patch.pk3 */ #define ASSET_HASH_SRB2_PK3 "c1b9577687f8a795104aef4600720ea7" -#define ASSET_HASH_ZONES_DTA "303838c6c534d9540288360fa49cca60" +#define ASSET_HASH_ZONES_PK3 "303838c6c534d9540288360fa49cca60" #define ASSET_HASH_PLAYER_DTA "cfca0f1c73023cbbd8f844f45480f799" #ifdef USE_PATCH_DTA #define ASSET_HASH_PATCH_PK3 "dbbf8bc6121618ee3be2d5b14650429b" diff --git a/src/d_main.c b/src/d_main.c index 37637edd6..5bb38eaea 100644 --- a/src/d_main.c +++ b/src/d_main.c @@ -852,7 +852,7 @@ static void IdentifyVersion(void) // checking in D_SRB2Main // Add the maps - D_AddFile(va(pandf,srb2waddir,"zones.dta")); + D_AddFile(va(pandf,srb2waddir,"zones.pk3")); // Add the players D_AddFile(va(pandf,srb2waddir, "player.dta")); @@ -1145,10 +1145,10 @@ void D_SRB2Main(void) // Check MD5s of autoloaded files W_VerifyFileMD5(mainwads++, ASSET_HASH_SRB2_PK3); // srb2.pk3 - W_VerifyFileMD5(mainwads++, ASSET_HASH_ZONES_DTA); // zones.dta + W_VerifyFileMD5(mainwads++, ASSET_HASH_ZONES_PK3); // zones.pk3 W_VerifyFileMD5(mainwads++, ASSET_HASH_PLAYER_DTA); // player.dta #ifdef USE_PATCH_DTA - W_VerifyFileMD5(mainwads++, ASSET_HASH_PATCH_DTA); // patch.dta + W_VerifyFileMD5(mainwads++, ASSET_HASH_PATCH_DTA); // 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. @@ -1157,7 +1157,7 @@ void D_SRB2Main(void) #else mainwads++; // srb2.pk3 - mainwads++; // zones.dta + mainwads++; // zones.pk3 mainwads++; // player.dta #ifdef USE_PATCH_DTA mainwads++; // patch.dta diff --git a/src/d_netfil.c b/src/d_netfil.c index ed2d11138..5e7f59310 100644 --- a/src/d_netfil.c +++ b/src/d_netfil.c @@ -752,11 +752,9 @@ void Got_Filetxpak(void) nameonly(filename); if (!(strcmp(filename, "srb2.pk3") - && strcmp(filename, "srb2.srb") - && strcmp(filename, "srb2.wad") - && strcmp(filename, "zones.dta") + && strcmp(filename, "zones.pk3") && strcmp(filename, "player.dta") - && strcmp(filename, "patch.dta") + && strcmp(filename, "patch.pk3") && strcmp(filename, "music.dta") )) I_Error("Tried to download \"%s\"", filename);