diff --git a/src/w_wad.c b/src/w_wad.c index d4da027b..a9379be5 100644 --- a/src/w_wad.c +++ b/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.