ansible-later: 2.0.22 -> 2.0.23
[NixPkgs.git] / pkgs / games / srb2kart / wadlocation.patch
blob1923cda041d25c172316bff477e353fc07179fac
1 diff --git a/src/sdl/i_system.c b/src/sdl/i_system.c
2 index 51f708d0..c4d971f7 100644
3 --- a/src/sdl/i_system.c
4 +++ b/src/sdl/i_system.c
5 @@ -139,7 +139,7 @@ typedef LPVOID (WINAPI *p_MapViewOfFile) (HANDLE, DWORD, DWORD, DWORD, SIZE_T);
7 // Locations for searching the srb2.srb
8 #if defined (__unix__) || defined(__APPLE__) || defined (UNIXCOMMON)
9 -#define DEFAULTWADLOCATION1 "/usr/local/share/games/SRB2Kart"
10 +#define DEFAULTWADLOCATION1 "@wadlocation@"
11 #define DEFAULTWADLOCATION2 "/usr/local/games/SRB2Kart"
12 #define DEFAULTWADLOCATION3 "/usr/share/games/SRB2Kart"
13 #define DEFAULTWADLOCATION4 "/usr/games/SRB2Kart"
14 @@ -3646,47 +3646,6 @@ static const char *locateWad(void)
15 if (((envstr = I_GetEnv("SRB2WADDIR")) != NULL) && isWadPathOk(envstr))
16 return envstr;
18 -#ifndef NOCWD
19 - I_OutputMsg(",.");
20 - // examine current dir
21 - strcpy(returnWadPath, ".");
22 - if (isWadPathOk(returnWadPath))
23 - return NULL;
24 -#endif
27 -#ifdef DEFAULTDIR
28 - I_OutputMsg(",HOME/" DEFAULTDIR);
29 - // examine user jart directory
30 - if ((envstr = I_GetEnv("HOME")) != NULL)
31 - {
32 - sprintf(returnWadPath, "%s" PATHSEP DEFAULTDIR, envstr);
33 - if (isWadPathOk(returnWadPath))
34 - return returnWadPath;
35 - }
36 -#endif
39 -#ifdef CMAKECONFIG
40 -#ifndef NDEBUG
41 - I_OutputMsg(","CMAKE_ASSETS_DIR);
42 - strcpy(returnWadPath, CMAKE_ASSETS_DIR);
43 - if (isWadPathOk(returnWadPath))
44 - {
45 - return returnWadPath;
46 - }
47 -#endif
48 -#endif
50 -#ifdef __APPLE__
51 - OSX_GetResourcesPath(returnWadPath);
52 - I_OutputMsg(",%s", returnWadPath);
53 - if (isWadPathOk(returnWadPath))
54 - {
55 - return returnWadPath;
56 - }
57 -#endif
59 // examine default dirs
60 #ifdef DEFAULTWADLOCATION1
61 I_OutputMsg(","DEFAULTWADLOCATION1);