From 37111c9c667e55fd9878295380d5798ebcac7dd5 Mon Sep 17 00:00:00 2001 From: Fabian Greffrath Date: Fri, 20 Dec 2019 14:34:56 +0100 Subject: [PATCH] add some common search directories to FindIWADFile() --- Source/d_main.c | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) diff --git a/Source/d_main.c b/Source/d_main.c index 672540b0..05c17f73 100644 --- a/Source/d_main.c +++ b/Source/d_main.c @@ -722,6 +722,15 @@ boolean WadFileStatus(char *filename,boolean *isdir) // killough 11/98: simplified, removed error-prone cut-n-pasted code // +const char *dirs[] = { + ".", + NULL, // D_DoomExeDir() + "/usr/local/share/games/doom", + "/usr/share/games/doom", + "/usr/local/share/doom", + "/usr/share/doom", +}; + char *FindIWADFile(void) { static const char *envvars[] = {"DOOMWADDIR", "HOME"}; @@ -754,9 +763,10 @@ char *FindIWADFile(void) AddDefaultExtension(strcat(strcpy(customiwad, "/"), iwad), ".wad"); } - for (j=0; j<2; j++) + dirs[1] = D_DoomExeDir(); + for (j=0; j