1 --- doomlegacy_src/linux_x/musserv/musserver.c.orig Sat Feb 22 20:51:24 2003
2 +++ doomlegacy_src/linux_x/musserv/musserver.c Sat Feb 22 20:52:15 2003
6 printf("pid %d %s\n", ppid, pproc);
7 - waddir = getenv("DOOMWADDIR");
10 + waddir = getenv("DOOMWADDIR") ? getenv("DOOMWADDIR") : "/usr/share/doomlegacy";
12 while ((x = getopt(argc, argv, "acd:fhi:lmt:u:Vv")) != -1)
14 --- doomlegacy_src/linux_x/musserv/readwad.c.orig Sat Feb 22 20:52:25 2003
15 +++ doomlegacy_src/linux_x/musserv/readwad.c Sat Feb 22 20:53:03 2003
19 if (!(waddir = getenv("DOOMWADDIR")))
21 + waddir = "/usr/share/doomlegacy";
23 wadfilename = malloc(2 + strlen(s) + strlen(waddir));
25 --- doomlegacy_src/linux_x/i_video_xshm.c.orig Sat Feb 22 20:45:02 2003
26 +++ doomlegacy_src/linux_x/i_video_xshm.c Sat Feb 22 20:46:49 2003
28 rendermode = render_opengl;
30 // try to open library in CWD
31 - dlptr = dlopen("./r_opengl.so",RTLD_NOW | RTLD_GLOBAL);
32 + dlptr = dlopen("/usr/lib/doomlegacy/r_opengl.so",RTLD_NOW | RTLD_GLOBAL);
35 // try to open in LIBPATH
36 --- doomlegacy_src/linux_x/i_system.c.orig Sat Feb 22 20:48:37 2003
37 +++ doomlegacy_src/linux_x/i_system.c Sat Feb 22 20:50:55 2003
41 // Locations for searching the legacy.dat
42 -#define DEFAULTWADLOCATION1 "/usr/local/games/legacy"
43 -#define DEFAULTWADLOCATION2 "/usr/games/legacy"
44 -#define DEFAULTSEARCHPATH1 "/usr/local"
45 +#define DEFAULTWADLOCATION1 "/usr/share/doomlegacy"
46 +#define DEFAULTWADLOCATION2 "/usr/share/games/doomlegacy"
47 +#define DEFAULTSEARCHPATH1 "/usr/share/games/"
48 #define DEFAULTSEARCHPATH2 "/usr/games"
49 #define WADKEYWORD "legacy.dat"
51 --- doomlegacy_src/linux_x/searchp.c.orig Sat Feb 22 20:53:41 2003
52 +++ doomlegacy_src/linux_x/searchp.c Sat Feb 22 20:54:22 2003
58 + strcpy(b,"/usr/X11R6/lib/doomlegacy_src/");
60 + if (stat(b, &s) == 0) {
64 /* get PATH, if not set just return filename, might be in cwd */
65 /* added "./" for current path 19990416 by Kin */
66 --- doomlegacy_src/d_main.c.orig Sat Feb 22 20:47:20 2003
67 +++ doomlegacy_src/d_main.c Sat Feb 22 20:48:10 2003
68 @@ -1022,16 +1022,8 @@
69 // change to the directory where 'legacy.dat' is found
72 - doomwaddir = getenv("DOOMWADDIR");
75 - // get the current directory (possible problem on NT with "." as current dir)
76 - if ( getcwd(pathtemp, _MAX_PATH) != NULL )
77 - doomwaddir = pathtemp;
82 + doomwaddir = getenv("DOOMWADDIR") ? getenv("DOOMWADDIR") : "/usr/share/doomlegacy";
85 // cwd is always "/" when app is dbl-clicked
86 if (!stricmp(doomwaddir,"/"))