thirdpartymirrors/RingRacers
1
0
Fork 0
mirror of https://github.com/KartKrewDev/RingRacers.git synced 2026-05-03 15:32:45 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'no-files-crash' into 'master'

Browse source 
Don't crash if you can't find a pwad or it's already loaded or etc

See merge request KartKrew/Kart!177
This commit is contained in:
Sal 2019-09-27 12:17:00 -04:00
commit 38112a5577
1 changed files with 5 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
src/d_main.c
View file

@ -1190,12 +1190,12 @@ void D_SRB2Main(void)
M_InitCharacterTables(); M_InitCharacterTables();
// load wad, including the main wad file // load wad, including the main wad file
CONS_Printf("W_InitMultipleFiles(): Adding IWAD and main PWADs.\n"); CONS_Printf("W_InitMultipleFiles(): Adding main IWAD and PWADs.\n");
if (!W_InitMultipleFiles(startupwadfiles, false)) if (!W_InitMultipleFiles(startupwadfiles, false))
#ifdef _DEBUG #ifdef _DEBUG
CONS_Error("A 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 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(startupwadfiles);
@ -1249,8 +1249,9 @@ void D_SRB2Main(void)
} }
} }
CONS_Printf("W_InitMultipleFiles(): Adding external PWADs.\n");
if (!W_InitMultipleFiles(startuppwads, true)) if (!W_InitMultipleFiles(startuppwads, true))
CONS_Error("A PWAD file was not found or not valid.\nCheck the log to see which ones.\n"); M_StartMessage(M_GetText("A PWAD file was not found or not valid.\nCheck log.txt to see which ones.\n\nPress ESC\n"), NULL, MM_NOTHING);
D_CleanFile(startuppwads); D_CleanFile(startuppwads);
// //