diff --git a/src/d_netcmd.c b/src/d_netcmd.c
index 8f6c45b3ee0a582ef560838e74404791a6aa6f30..5f7402396141c4f28def98f64b87d3824783b29d 100644
--- a/src/d_netcmd.c
+++ b/src/d_netcmd.c
@@ -2967,6 +2967,7 @@ static void Command_Addfile(void)
XBOXSTATIC char buf[256];
char *buf_p = buf;
INT32 i;
+ int musiconly; // W_VerifyNMUSlumps isn't boolean
if (COM_Argc() != 2)
{
@@ -2981,7 +2982,9 @@ static void Command_Addfile(void)
if (!isprint(fn[i]) || fn[i] == ';')
return;
- if (!W_VerifyNMUSlumps(fn))
+ musiconly = W_VerifyNMUSlumps(fn);
+
+ if (!musiconly)
{
// ... But only so long as they contain nothing more then music and sprites.
if (netgame && !(server || adminplayer == consoleplayer))
@@ -2993,7 +2996,7 @@ static void Command_Addfile(void)
}
// Add file on your client directly if it is trivial, or you aren't in a netgame.
- if (!(netgame || multiplayer) || W_VerifyNMUSlumps(fn))
+ if (!(netgame || multiplayer) || musiconly)
{
P_AddWadFile(fn, NULL);
return;
@@ -3013,9 +3016,7 @@ static void Command_Addfile(void)
#else
FILE *fhandle;
- fhandle = fopen(fn, "rb");
-
- if (fhandle)
+ if ((fhandle = W_OpenWadFile(&fn, true)) != NULL)
{
tic_t t = I_GetTime();
CONS_Debug(DBG_SETUP, "Making MD5 for %s\n",fn);
@@ -3023,11 +3024,8 @@ static void Command_Addfile(void)
CONS_Debug(DBG_SETUP, "MD5 calc for %s took %f second\n", fn, (float)(I_GetTime() - t)/TICRATE);
fclose(fhandle);
}
- else
- {
- CONS_Printf(M_GetText("File %s not found.\n"), fn);
+ else // file not found
return;
- }
#endif
WRITEMEM(buf_p, md5sum, 16);
}
diff --git a/src/w_wad.c b/src/w_wad.c
index e4cb930500b2c2e75a77d2506557ac519c5bb0c4..3a8285593e81cf067750712cce9468a57fce771c 100644
--- a/src/w_wad.c
+++ b/src/w_wad.c
@@ -133,6 +133,47 @@ void W_Shutdown(void)
static char filenamebuf[MAX_WADPATH];
+// W_OpenWadFile
+// Helper function for opening the WAD file.
+// Returns the FILE * handle for the file, or NULL if not found or could not be opened
+// If "useerrors" is true then print errors in the console, else just don't bother
+// "filename" may be modified to have the correct path the actual file is located in, if necessary
+FILE *W_OpenWadFile(const char **filename, boolean useerrors)
+{
+ FILE *handle;
+
+ strncpy(filenamebuf, *filename, MAX_WADPATH);
+ filenamebuf[MAX_WADPATH - 1] = '\0';
+ *filename = filenamebuf;
+
+ // open wad file
+ if ((handle = fopen(*filename, "rb")) == NULL)
+ {
+ // If we failed to load the file with the path as specified by
+ // the user, strip the directories and search for the file.
+ nameonly(filenamebuf);
+
+ // If findfile finds the file, the full path will be returned
+ // in filenamebuf == *filename.
+ if (findfile(filenamebuf, NULL, true))
+ {
+ if ((handle = fopen(*filename, "rb")) == NULL)
+ {
+ if (useerrors)
+ CONS_Alert(CONS_ERROR, M_GetText("Can't open %s\n"), *filename);
+ return NULL;
+ }
+ }
+ else
+ {
+ if (useerrors)
+ CONS_Alert(CONS_ERROR, M_GetText("File %s not found.\n"), *filename);
+ return NULL;
+ }
+ }
+ return handle;
+}
+
// search for all DEHACKED lump in all wads and load it
static inline void W_LoadDehackedLumps(UINT16 wadnum)
{
@@ -234,7 +275,6 @@ static void W_InvalidateLumpnumCache(void)
memset(lumpnumcache, 0, sizeof (lumpnumcache));
}
-
// Allocate a wadfile, setup the lumpinfo (directory) and
// lumpcache, add the wadfile to the current active wadfiles
//
@@ -271,33 +311,9 @@ UINT16 W_LoadWadFile(const char *filename)
return INT16_MAX;
}
- strncpy(filenamebuf, filename, MAX_WADPATH);
- filenamebuf[MAX_WADPATH - 1] = '\0';
- filename = filenamebuf;
-
// open wad file
- if ((handle = fopen(filename, "rb")) == NULL)
- {
- // If we failed to load the file with the path as specified by
- // the user, strip the directories and search for the file.
- nameonly(filenamebuf);
-
- // If findfile finds the file, the full path will be returned
- // in filenamebuf == filename.
- if (findfile(filenamebuf, NULL, true))
- {
- if ((handle = fopen(filename, "rb")) == NULL)
- {
- CONS_Alert(CONS_ERROR, M_GetText("Can't open %s\n"), filename);
- return INT16_MAX;
- }
- }
- else
- {
- CONS_Alert(CONS_ERROR, M_GetText("File %s not found.\n"), filename);
- return INT16_MAX;
- }
- }
+ if ((handle = W_OpenWadFile(&filename, true)) == NULL)
+ return INT16_MAX;
// Check if wad files will overflow fileneededbuffer. Only the filename part
// is send in the packet; cf.
@@ -1115,21 +1131,11 @@ static int W_VerifyFile(const char *filename, lumpchecklist_t *checklist,
size_t i, j;
int goodfile = false;
- if (!checklist) I_Error("No checklist for %s\n", filename);
- strlcpy(filenamebuf, filename, MAX_WADPATH);
- filename = filenamebuf;
+ if (!checklist)
+ I_Error("No checklist for %s\n", filename);
// open wad file
- if ((handle = fopen(filename, "rb")) == NULL)
- {
- nameonly(filenamebuf); // leave full path here
- if (findfile(filenamebuf, NULL, true))
- {
- if ((handle = fopen(filename, "rb")) == NULL)
- return -1;
- }
- else
- return -1;
- }
+ if ((handle = W_OpenWadFile(&filename, false)) == NULL)
+ return -1;
// detect dehacked file with the "soc" extension
if (stricmp(&filename[strlen(filename) - 4], ".soc") != 0
diff --git a/src/w_wad.h b/src/w_wad.h
index b03e376bfaf76c62778a163f44994c25fc37efaf..f7ea64a565098c4d7e3df0ab0ff30c37f1ba05e2 100644
--- a/src/w_wad.h
+++ b/src/w_wad.h
@@ -82,6 +82,8 @@ extern wadfile_t *wadfiles[MAX_WADFILES];
void W_Shutdown(void);
+// Opens a WAD file. Returns the FILE * handle for the file, or NULL if not found or could not be opened
+FILE *W_OpenWadFile(const char **filename, boolean useerrors);
// Load and add a wadfile to the active wad files, returns numbers of lumps, INT16_MAX on error
UINT16 W_LoadWadFile(const char *filename);
#ifdef DELFILE