From ba7d31945760d6a7d519efd9f056d248bf7eb5fb Mon Sep 17 00:00:00 2001 From: toaster Date: Sun, 20 Aug 2023 22:06:11 +0100 Subject: [PATCH] Make bios.pk3 consistent filename Removes all reference to main.kart, not just the obvious ones. --- src/config.h.in | 2 +- src/d_main.c | 6 +++--- src/k_menudraw.c | 2 +- src/sdl/i_system.c | 12 ++++++------ src/sdl12/i_system.c | 10 +++++----- 5 files changed, 16 insertions(+), 16 deletions(-) diff --git a/src/config.h.in b/src/config.h.in index e08d94e12..1dd4da57d 100644 --- a/src/config.h.in +++ b/src/config.h.in @@ -31,7 +31,7 @@ * Last updated 2020 / 08 / 30 - Kart v1.3 - patch.kart */ -#define ASSET_HASH_MAIN_KART "00000000000000000000000000000000" +#define ASSET_HASH_BIOS_PK3 "00000000000000000000000000000000" #define ASSET_HASH_GFX_PK3 "00000000000000000000000000000000" #define ASSET_HASH_TEXTURES_GENERAL_PK3 "00000000000000000000000000000000" #define ASSET_HASH_TEXTURES_SEGA_PK3 "00000000000000000000000000000000" diff --git a/src/d_main.c b/src/d_main.c index 76ffb1a57..9652f0d10 100644 --- a/src/d_main.c +++ b/src/d_main.c @@ -1117,7 +1117,7 @@ static void IdentifyVersion(void) const char *srb2waddir = NULL; #if (defined (__unix__) && !defined (MSDOS)) || defined (UNIXCOMMON) || defined (HAVE_SDL) - // change to the directory where 'main.kart' is found + // change to the directory where 'bios.pk3' is found srb2waddir = I_LocateWad(); #endif @@ -1137,7 +1137,7 @@ static void IdentifyVersion(void) // Load the IWAD if (! AddIWAD()) { - I_Error("MAIN.KART not found! Expected in %s\n", srb2waddir); + I_Error("\"bios.pk3\" not found! Expected in %s\n", srb2waddir); } // will be overwritten in case of -cdrom or unix/win home @@ -1481,7 +1481,7 @@ 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 + W_VerifyFileMD5(mainwads, ASSET_HASH_BIOS_PK3); // bios.pk3 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_PK3); // textures_segazones.pk3 diff --git a/src/k_menudraw.c b/src/k_menudraw.c index b789a97f4..4ee9e751f 100644 --- a/src/k_menudraw.c +++ b/src/k_menudraw.c @@ -5048,7 +5048,7 @@ void M_DrawAddons(void) m = numwadfiles-(mainwads+musicwads+1); - V_DrawCenteredString(BASEVIDWIDTH/2, y+4, (majormods ? highlightflags : V_TRANSLUCENT), va("%ld ADD-ON%s LOADED", (long)m, (m == 1) ? "" : "S")); //+2 for music, sounds, +1 for main.kart + V_DrawCenteredString(BASEVIDWIDTH/2, y+4, (majormods ? highlightflags : V_TRANSLUCENT), va("%ld ADD-ON%s LOADED", (long)m, (m == 1) ? "" : "S")); //+2 for music, sounds, +1 for bios.pk3 } #undef addonsseperation diff --git a/src/sdl/i_system.c b/src/sdl/i_system.c index aed47915d..d634aa368 100644 --- a/src/sdl/i_system.c +++ b/src/sdl/i_system.c @@ -137,7 +137,7 @@ typedef LPVOID (WINAPI *p_MapViewOfFile) (HANDLE, DWORD, DWORD, DWORD, SIZE_T); #define UNIXBACKTRACE #endif -// Locations for searching for main.kart +// Locations for searching for bios.pk3 #if defined (__unix__) || defined(__APPLE__) || defined (UNIXCOMMON) #define DEFAULTWADLOCATION1 "/usr/local/share/games/RingRacers" #define DEFAULTWADLOCATION2 "/usr/local/games/RingRacers" @@ -150,7 +150,7 @@ typedef LPVOID (WINAPI *p_MapViewOfFile) (HANDLE, DWORD, DWORD, DWORD, SIZE_T); /** \brief WAD file to look for */ -#define WADKEYWORD "main.kart" +#define WADKEYWORD "bios.pk3" /** \brief holds wad path */ static char returnWadPath[256]; @@ -2104,7 +2104,7 @@ static void pathonly(char *s) } } -/** \brief search for main.kart in the given path +/** \brief search for bios.pk3 in the given path \param searchDir starting path @@ -2128,9 +2128,9 @@ static const char *searchWad(const char *searchDir) return NULL; } -/** \brief go through all possible paths and look for main.kart +/** \brief go through all possible paths and look for bios.pk3 - \return path to main.kart if any + \return path to bios.pk3 if any */ static const char *locateWad(void) @@ -2260,7 +2260,7 @@ const char *I_LocateWad(void) if (waddir) { - // change to the directory where we found main.kart + // change to the directory where we found bios.pk3 #if defined (_WIN32) SetCurrentDirectoryA(waddir); #else diff --git a/src/sdl12/i_system.c b/src/sdl12/i_system.c index 2a6608039..0f633f290 100644 --- a/src/sdl12/i_system.c +++ b/src/sdl12/i_system.c @@ -145,7 +145,7 @@ void __set_fpscr(long); // in libgcc / kernel's startup.s? #define O_BINARY 0 #endif -// Locations for searching the main.kart +// Locations for searching the bios.pk3 #ifdef _arch_dreamcast #define DEFAULTWADLOCATION1 "/cd" #define DEFAULTWADLOCATION2 "/pc" @@ -3436,7 +3436,7 @@ static void pathonly(char *s) } } -/** \brief search for main.kart in the given path +/** \brief search for bios.pk3 in the given path \param searchDir starting path @@ -3460,9 +3460,9 @@ static const char *searchWad(const char *searchDir) return NULL; } -/** \brief go through all possible paths and look for main.kart +/** \brief go through all possible paths and look for bios.pk3 - \return path to main.kart if any + \return path to bios.pk3 if any */ static const char *locateWad(void) { @@ -3579,7 +3579,7 @@ const char *I_LocateWad(void) if (waddir) { - // change to the directory where we found main.kart + // change to the directory where we found bios.pk3 #if (defined (_WIN32) && !defined (_WIN32_WCE)) && !defined (_XBOX) SetCurrentDirectoryA(waddir); #elif !defined (_WIN32_WCE) && !defined (_PS3)