Allow macOS and Linux to find files in the executable directory #493
Conversation
prboom2/src/SDL/i_system.c
Outdated
| @@ -236,7 +236,12 @@ void I_SwitchToWindow(HWND hwnd) | |||
| } | |||
| } | |||
|
|
|||
| const char *I_DoomExeDir(void) | |||
| const char *I_DoomDir(void) | |||
There was a problem hiding this comment.
Shall we rather call this I_ConfigDir?
There was a problem hiding this comment.
I was originally going to name it that, but opted with DoomDir since that folder hosts more than just the config file.
Made a new commit that changes the name
There was a problem hiding this comment.
Hm, maybe I_DataDir? It's maybe too generic, plus confusing since dsda-doom has a "data dir" as well that's one level below that. Any other ideas?
There was a problem hiding this comment.
I like I_ConfigDir.
Its pretty clear what it represents, so no one will be confused.
prboom2/src/SDL/i_system.c
Outdated
| Z_Free(base); | ||
| base = (char*)Z_Malloc(1024); | ||
| if (!M_getcwd(base, 1024) || !M_WriteAccess(base)) | ||
| strcpy(base, current_dir_dummy); |
There was a problem hiding this comment.
Can we just do strcpy(base, ".");? Does this dummy variable need to persist for some reason?
There was a problem hiding this comment.
No there is no reason it needs to persist. I simply copied over the code from the Windows function, didnt even try to understand it.
Made a new commit.
Ive been meaning to make this PR for like a year :P
This is most useful for finding dsda-doom.wad. When installing/updating, you would need to copy dsda-doom.wad to some folder that dsda searched (~/.dsda-doom for example). This sucked, so adding the executable directory to the search path is pretty helpful.
Will create merge conflicts in PR #491