Make bios.pk3 consistent filename

Removes all reference to main.kart, not just the obvious ones.
This commit is contained in:
toaster 2023-08-20 22:06:11 +01:00
parent 07aabdfdb3
commit ba7d319457
5 changed files with 16 additions and 16 deletions

View file

@ -31,7 +31,7 @@
* Last updated 2020 / 08 / 30 - Kart v1.3 - patch.kart * 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_GFX_PK3 "00000000000000000000000000000000"
#define ASSET_HASH_TEXTURES_GENERAL_PK3 "00000000000000000000000000000000" #define ASSET_HASH_TEXTURES_GENERAL_PK3 "00000000000000000000000000000000"
#define ASSET_HASH_TEXTURES_SEGA_PK3 "00000000000000000000000000000000" #define ASSET_HASH_TEXTURES_SEGA_PK3 "00000000000000000000000000000000"

View file

@ -1117,7 +1117,7 @@ static void IdentifyVersion(void)
const char *srb2waddir = NULL; const char *srb2waddir = NULL;
#if (defined (__unix__) && !defined (MSDOS)) || defined (UNIXCOMMON) || defined (HAVE_SDL) #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(); srb2waddir = I_LocateWad();
#endif #endif
@ -1137,7 +1137,7 @@ static void IdentifyVersion(void)
// Load the IWAD // Load the IWAD
if (! AddIWAD()) 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 // will be overwritten in case of -cdrom or unix/win home
@ -1481,7 +1481,7 @@ void D_SRB2Main(void)
#endif #endif
// Check MD5s of autoloaded files // Check MD5s of autoloaded files
// Note: Do not add any files that ignore MD5! // 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_GFX_PK3); // gfx.pk3
mainwads++; W_VerifyFileMD5(mainwads, ASSET_HASH_TEXTURES_GENERAL_PK3); // textures_general.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 mainwads++; W_VerifyFileMD5(mainwads, ASSET_HASH_TEXTURES_SEGA_PK3); // textures_segazones.pk3

View file

@ -5048,7 +5048,7 @@ void M_DrawAddons(void)
m = numwadfiles-(mainwads+musicwads+1); 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 #undef addonsseperation

View file

@ -137,7 +137,7 @@ typedef LPVOID (WINAPI *p_MapViewOfFile) (HANDLE, DWORD, DWORD, DWORD, SIZE_T);
#define UNIXBACKTRACE #define UNIXBACKTRACE
#endif #endif
// Locations for searching for main.kart // Locations for searching for bios.pk3
#if defined (__unix__) || defined(__APPLE__) || defined (UNIXCOMMON) #if defined (__unix__) || defined(__APPLE__) || defined (UNIXCOMMON)
#define DEFAULTWADLOCATION1 "/usr/local/share/games/RingRacers" #define DEFAULTWADLOCATION1 "/usr/local/share/games/RingRacers"
#define DEFAULTWADLOCATION2 "/usr/local/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 /** \brief WAD file to look for
*/ */
#define WADKEYWORD "main.kart" #define WADKEYWORD "bios.pk3"
/** \brief holds wad path /** \brief holds wad path
*/ */
static char returnWadPath[256]; 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 \param searchDir starting path
@ -2128,9 +2128,9 @@ static const char *searchWad(const char *searchDir)
return NULL; 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) static const char *locateWad(void)
@ -2260,7 +2260,7 @@ const char *I_LocateWad(void)
if (waddir) if (waddir)
{ {
// change to the directory where we found main.kart // change to the directory where we found bios.pk3
#if defined (_WIN32) #if defined (_WIN32)
SetCurrentDirectoryA(waddir); SetCurrentDirectoryA(waddir);
#else #else

View file

@ -145,7 +145,7 @@ void __set_fpscr(long); // in libgcc / kernel's startup.s?
#define O_BINARY 0 #define O_BINARY 0
#endif #endif
// Locations for searching the main.kart // Locations for searching the bios.pk3
#ifdef _arch_dreamcast #ifdef _arch_dreamcast
#define DEFAULTWADLOCATION1 "/cd" #define DEFAULTWADLOCATION1 "/cd"
#define DEFAULTWADLOCATION2 "/pc" #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 \param searchDir starting path
@ -3460,9 +3460,9 @@ static const char *searchWad(const char *searchDir)
return NULL; 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) static const char *locateWad(void)
{ {
@ -3579,7 +3579,7 @@ const char *I_LocateWad(void)
if (waddir) 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) #if (defined (_WIN32) && !defined (_WIN32_WCE)) && !defined (_XBOX)
SetCurrentDirectoryA(waddir); SetCurrentDirectoryA(waddir);
#elif !defined (_WIN32_WCE) && !defined (_PS3) #elif !defined (_WIN32_WCE) && !defined (_PS3)