mirror of
https://git.do.srb2.org/KartKrew/Kart-Public.git
synced 2024-12-27 04:41:23 +00:00
Merge branch 'load-logging-improvements' into 'master'
Small logging improvements for addon loading See merge request KartKrew/Kart-Public!272
This commit is contained in:
commit
750b8bfe20
1 changed files with 7 additions and 3 deletions
10
src/w_wad.c
10
src/w_wad.c
|
@ -671,7 +671,7 @@ UINT16 W_InitFile(const char *filename)
|
|||
else
|
||||
refreshdirname = NULL;
|
||||
|
||||
//CONS_Debug(DBG_SETUP, "Loading %s\n", filename);
|
||||
CONS_Printf("Loading %s\n", filename);
|
||||
//
|
||||
// check if limit of active wadfiles
|
||||
//
|
||||
|
@ -848,6 +848,7 @@ void W_UnloadWadFile(UINT16 num)
|
|||
INT32 W_InitMultipleFiles(char **filenames, boolean addons)
|
||||
{
|
||||
INT32 rc = 1;
|
||||
INT32 overallrc = 1;
|
||||
|
||||
// will be realloced as lumps are added
|
||||
for (; *filenames; filenames++)
|
||||
|
@ -856,13 +857,16 @@ INT32 W_InitMultipleFiles(char **filenames, boolean addons)
|
|||
G_SetGameModified(true, false);
|
||||
|
||||
//CONS_Debug(DBG_SETUP, "Loading %s\n", *filenames);
|
||||
rc &= (W_InitFile(*filenames) != INT16_MAX) ? 1 : 0;
|
||||
rc = W_InitFile(*filenames);
|
||||
if (rc == INT16_MAX)
|
||||
CONS_Printf(M_GetText("Errors occurred while loading %s; not added.\n"), *filenames);
|
||||
overallrc &= (rc != INT16_MAX) ? 1 : 0;
|
||||
}
|
||||
|
||||
if (!numwadfiles)
|
||||
I_Error("W_InitMultipleFiles: no files found");
|
||||
|
||||
return rc;
|
||||
return overallrc;
|
||||
}
|
||||
|
||||
/** Make sure a lump number is valid.
|
||||
|
|
Loading…
Reference in a new issue