From 45af41ef0cf05b3c4efd0196e16f466fa7aa416c Mon Sep 17 00:00:00 2001 From: James R Date: Wed, 26 Aug 2020 20:20:12 -0700 Subject: [PATCH 1/2] Check DEFAULTDIR for srb2.srb after cwd --- src/sdl/i_system.c | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/src/sdl/i_system.c b/src/sdl/i_system.c index c630e5d8b..10fa99cb9 100644 --- a/src/sdl/i_system.c +++ b/src/sdl/i_system.c @@ -3660,6 +3660,18 @@ static const char *locateWad(void) #endif +#ifdef DEFAULTDIR + I_OutputMsg(",HOME/.srb2kart"); + // 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); From e4a522353fd77176e17e439e81869a80f9d07a57 Mon Sep 17 00:00:00 2001 From: James R Date: Wed, 26 Aug 2020 23:37:52 -0700 Subject: [PATCH 2/2] Say DEFAULTDIR not .srb2kart --- src/sdl/i_system.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/sdl/i_system.c b/src/sdl/i_system.c index 10fa99cb9..3c3f1cc50 100644 --- a/src/sdl/i_system.c +++ b/src/sdl/i_system.c @@ -3661,7 +3661,7 @@ static const char *locateWad(void) #ifdef DEFAULTDIR - I_OutputMsg(",HOME/.srb2kart"); + I_OutputMsg(",HOME/" DEFAULTDIR); // examine user jart directory if ((envstr = I_GetEnv("HOME")) != NULL) {