From b93a8215c8009f2e970dfcf70df83308bde1d1f7 Mon Sep 17 00:00:00 2001 From: NepDisk Date: Tue, 10 Jun 2025 18:41:20 -0400 Subject: [PATCH] Make bonuschars.kart an Iwad --- src/d_main.cpp | 20 ++++++++++++-------- src/d_main.h | 2 ++ src/d_netfil.c | 1 + src/doomdef.h | 2 +- 4 files changed, 16 insertions(+), 9 deletions(-) diff --git a/src/d_main.cpp b/src/d_main.cpp index 22089ab2e..47583d29d 100644 --- a/src/d_main.cpp +++ b/src/d_main.cpp @@ -81,15 +81,16 @@ #include // Put hashes here to get them out of header hell. -#define ASSET_HASH_SRB2_SRB 0xf3ec1ea4d0eca4a9 -#define ASSET_HASH_GFX_KART 0xc91b0d43f5ba131f -#define ASSET_HASH_TEXTURES_KART 0xb4211b2f32b6a291 -#define ASSET_HASH_CHARS_KART 0x1e68a3e01aa5c68b -#define ASSET_HASH_MAPS_KART 0x38558ed00da41ce9 -#define ASSET_HASH_MAIN_PK3 0xfd350f17314cd848 -#define ASSET_HASH_MAPPATCH_PK3 0x36ef622b54d98871 +#define ASSET_HASH_SRB2_SRB 0xf3ec1ea4d0eca4a9 +#define ASSET_HASH_GFX_KART 0xc91b0d43f5ba131f +#define ASSET_HASH_TEXTURES_KART 0xb4211b2f32b6a291 +#define ASSET_HASH_CHARS_KART 0x1e68a3e01aa5c68b +#define ASSET_HASH_MAPS_KART 0x38558ed00da41ce9 +#define ASSET_HASH_MAIN_PK3 0x41568cadaf608e27 +#define ASSET_HASH_MAPPATCH_PK3 0x36ef622b54d98871 +#define ASSET_HASH_BONUSCHARS_KART 0x60e6f13d822a7461 #ifdef USE_PATCH_FILE -#define ASSET_HASH_PATCH_PK3 0x0000000000000000 +#define ASSET_HASH_PATCH_PK3 0x0000000000000000 #endif #ifdef CMAKECONFIG @@ -1202,6 +1203,7 @@ static void IdentifyVersion(void) D_AddFile(startupiwads, va(pandf,srb2waddir,MAPSNAME)); D_AddFile(startupiwads, va(pandf,srb2waddir,MAINNAME)); D_AddFile(startupiwads, va(pandf,srb2waddir,MAPPATCHNAME)); + D_AddFile(startupiwads, va(pandf,srb2waddir,BONUSCHARSNAME)); #ifdef USE_PATCH_FILE D_AddFile(startupiwads, va(pandf,srb2waddir,PATCHNAME)); #endif @@ -1483,6 +1485,7 @@ void D_SRB2Main(void) W_VerifyFileHash(MAINWAD_MAPS, ASSET_HASH_MAPS_KART); W_VerifyFileHash(MAINWAD_MAIN, ASSET_HASH_MAIN_PK3); W_VerifyFileHash(MAINWAD_MAPPATCH, ASSET_HASH_MAPPATCH_PK3); + W_VerifyFileHash(MAINWAD_BONUSCHARS, ASSET_HASH_BONUSCHARS_KART); #ifdef USE_PATCH_FILE W_VerifyFileHash(MAINWAD_PATCH, ASSET_HASH_PATCH_PK3); #endif @@ -1495,6 +1498,7 @@ void D_SRB2Main(void) wadfiles[MAINWAD_MAPS]->compatmode = true; wadfiles[MAINWAD_MAIN]->compatmode = false; wadfiles[MAINWAD_MAPPATCH]->compatmode = false; + wadfiles[MAINWAD_BONUSCHARS]->compatmode = true; #ifdef USE_PATCH_FILE wadfiles[MAINWAD_PATCH]->compatmode = false; #endif diff --git a/src/d_main.h b/src/d_main.h index 69f5459b7..0d30cb8df 100644 --- a/src/d_main.h +++ b/src/d_main.h @@ -29,6 +29,7 @@ extern "C" { #define MAPSNAME "maps.kart" #define MAINNAME "main.pk3" #define MAPPATCHNAME "mappatch.pk3" +#define BONUSCHARSNAME "bonuschars.kart" #define PATCHNAME "patch.pk3" #define MUSICNAME "music.kart" #define SOUNDSNAME "sounds.kart" @@ -42,6 +43,7 @@ typedef enum MAINWAD_MAPS, MAINWAD_MAIN, MAINWAD_MAPPATCH, + MAINWAD_BONUSCHARS, #ifdef USE_PATCH_FILE MAINWAD_PATCH, #endif diff --git a/src/d_netfil.c b/src/d_netfil.c index d9d9be166..ddddb18f6 100644 --- a/src/d_netfil.c +++ b/src/d_netfil.c @@ -1409,6 +1409,7 @@ void PT_FileFragment(void) || !strcmp(filename, MAPSNAME) || !strcmp(filename, MAINNAME) || !strcmp(filename, MAPPATCHNAME) + || !strcmp(filename, BONUSCHARSNAME) || !strcmp(filename, PATCHNAME) || !strcmp(filename, SOUNDSNAME) || !strcmp(filename, MUSICNAME) diff --git a/src/doomdef.h b/src/doomdef.h index f6776387f..b45082c55 100644 --- a/src/doomdef.h +++ b/src/doomdef.h @@ -103,7 +103,7 @@ extern "C" { // Special Hashing. //#define NOMD5 -#define NOFILEHASH +//#define NOFILEHASH // Uncheck this to compile debugging code //#define RANGECHECK