thirdpartymirrors/RingRacers
1
0
Fork 0
mirror of https://github.com/KartKrewDev/RingRacers.git synced 2025-10-30 08:01:28 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

D_AddFile fixes

Browse source
This commit is contained in:
Sally Coolatta 2020-08-10 20:35:17 -04:00
parent 60d7c7a7e4
commit 76241bb26b
2 changed files with 16 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

30
src/d_main.c
View file

@ -98,7 +98,7 @@ UINT8 window_notinfocus = false;
// //
// DEMO LOOP // DEMO LOOP
// //
static char *startupwadfiles[MAX_WADFILES]; static char *startupiwads[MAX_WADFILES];
static char *startuppwads[MAX_WADFILES]; static char *startuppwads[MAX_WADFILES];
boolean devparm = false; // started game with -devparm boolean devparm = false; // started game with -devparm
@ -1135,7 +1135,7 @@ static void IdentifyVersion(void)
if (mainresource == NULL) if (mainresource == NULL)
I_Error("No more free memory to look in %s", srb2waddir); I_Error("No more free memory to look in %s", srb2waddir);
else else
sprintf(srb2wad, pandf, srb2waddir, "main.kart"); sprintf(mainresource, pandf, srb2waddir, "main.kart");
// will be overwritten in case of -cdrom or unix/win home // will be overwritten in case of -cdrom or unix/win home
snprintf(configfile, sizeof configfile, "%s" PATHSEP CONFIGFILENAME, srb2waddir); snprintf(configfile, sizeof configfile, "%s" PATHSEP CONFIGFILENAME, srb2waddir);
@ -1143,7 +1143,7 @@ static void IdentifyVersion(void)
// Load the IWAD // Load the IWAD
if (mainresource != NULL && FIL_ReadFileOK(mainresource)) if (mainresource != NULL && FIL_ReadFileOK(mainresource))
D_AddFile(mainresource); D_AddFile(mainresource, startupiwads);
else else
I_Error("main.kart not found! Expected in %s, ss file: %s \n", srb2waddir, mainresource); I_Error("main.kart not found! Expected in %s, ss file: %s \n", srb2waddir, mainresource);
@ -1153,20 +1153,20 @@ static void IdentifyVersion(void)
// if you change the ordering of this or add/remove a file, be sure to update the md5 // if you change the ordering of this or add/remove a file, be sure to update the md5
// checking in D_SRB2Main // checking in D_SRB2Main
D_AddFile(va(pandf,srb2waddir,"gfx.pk3")); D_AddFile(va(pandf,srb2waddir,"gfx.pk3"), startupiwads);
D_AddFile(va(pandf,srb2waddir,"textures.pk3")); D_AddFile(va(pandf,srb2waddir,"textures.pk3"), startupiwads);
D_AddFile(va(pandf,srb2waddir,"chars.pk3")); D_AddFile(va(pandf,srb2waddir,"chars.pk3"), startupiwads);
D_AddFile(va(pandf,srb2waddir,"maps.pk3")); D_AddFile(va(pandf,srb2waddir,"maps.pk3"), startupiwads);
#ifdef USE_PATCH_FILE #ifdef USE_PATCH_FILE
D_AddFile(va(pandf,srb2waddir,"patch.pk3")); D_AddFile(va(pandf,srb2waddir,"patch.pk3"), startupiwads);
#endif #endif
#if 0 #if 0
// TODO: pk3 doesn't support music replacement IIRC // TODO: pk3 doesn't support music replacement IIRC
// music barely benefits from the compression anyway // music barely benefits from the compression anyway
// would be nice for the folders, though // would be nice for the folders, though
D_AddFile(va(pandf,srb2waddir,"sounds.pk3")); D_AddFile(va(pandf,srb2waddir,"sounds.pk3"), startupiwads);
D_AddFile(va(pandf,srb2waddir,"music.pk3")); D_AddFile(va(pandf,srb2waddir,"music.pk3"), startupiwads);
#else #else
@ -1177,7 +1177,7 @@ static void IdentifyVersion(void)
const char *musicpath = va(pandf,srb2waddir,str);\ const char *musicpath = va(pandf,srb2waddir,str);\
int ms = W_VerifyNMUSlumps(musicpath); \ int ms = W_VerifyNMUSlumps(musicpath); \
if (ms == 1) \ if (ms == 1) \
D_AddFile(musicpath); \ D_AddFile(musicpath, startupiwads); \
else if (ms == 0) \ else if (ms == 0) \
I_Error("File "str" has been modified with non-music/sound lumps"); \ I_Error("File "str" has been modified with non-music/sound lumps"); \
} }
@ -1213,6 +1213,8 @@ void D_SRB2Main(void)
{ {
INT32 p; INT32 p;
UINT16 wadnum;
INT32 pstartmap = 1; INT32 pstartmap = 1;
boolean autostart = false; boolean autostart = false;
@ -1402,13 +1404,13 @@ void D_SRB2Main(void)
// load wad, including the main wad file // load wad, including the main wad file
CONS_Printf("W_InitMultipleFiles(): Adding main IWAD and PWADs.\n"); CONS_Printf("W_InitMultipleFiles(): Adding main IWAD and PWADs.\n");
if (!W_InitMultipleFiles(startupwadfiles, mainwads)) if (!W_InitMultipleFiles(startupiwads, mainwads))
#ifdef _DEBUG #ifdef _DEBUG
CONS_Error("A main WAD file was not found or not valid.\nCheck the log to see which ones.\n"); CONS_Error("A main WAD file was not found or not valid.\nCheck the log to see which ones.\n");
#else #else
I_Error("A main WAD file was not found or not valid.\nCheck the log to see which ones.\n"); I_Error("A main WAD file was not found or not valid.\nCheck the log to see which ones.\n");
#endif #endif
D_CleanFile(startupwadfiles); D_CleanFile(startupiwads);
mainwads = 0; mainwads = 0;
@ -1434,8 +1436,6 @@ void D_SRB2Main(void)
#endif //ifndef DEVELOP #endif //ifndef DEVELOP
mainwadstally = packetsizetally;
// //
// search for maps // search for maps
// //

3
src/d_netcmd.c
View file

@ -4658,8 +4658,7 @@ static void Command_Addfile(void)
// check total packet size and no of files currently loaded // check total packet size and no of files currently loaded
// See W_LoadWadFile in w_wad.c // See W_LoadWadFile in w_wad.c
if ((numwadfiles >= MAX_WADFILES) if (numwadfiles >= MAX_WADFILES)
|| ((packetsizetally + nameonlylength(fn) + 22) > MAXFILENEEDED*sizeof(UINT8)))
{ {
CONS_Alert(CONS_ERROR, M_GetText("Too many files loaded to add %s\n"), fn); CONS_Alert(CONS_ERROR, M_GetText("Too many files loaded to add %s\n"), fn);
return; return;