Merge remote-tracking branch 'origin/master' into next

This commit is contained in:
James R 2020-08-29 11:26:52 -07:00
commit 3f842937a8

View file

@ -3660,6 +3660,18 @@ static const char *locateWad(void)
#endif
#ifdef DEFAULTDIR
I_OutputMsg(",HOME/" DEFAULTDIR);
// examine user jart directory
if ((envstr = I_GetEnv("HOME")) != NULL)
{
sprintf(returnWadPath, "%s" PATHSEP DEFAULTDIR, envstr);
if (isWadPathOk(returnWadPath))
return returnWadPath;
}
#endif
#ifdef CMAKECONFIG
#ifndef NDEBUG
I_OutputMsg(","CMAKE_ASSETS_DIR);