1 diff -Nru bzflag-1.7g0/src/bzflag/bzflag.cxx bzflag-1.7g0.new/src/bzflag/bzflag.cxx
2 --- bzflag-1.7g0/src/bzflag/bzflag.cxx Thu Dec 5 17:22:44 2002
3 +++ bzflag-1.7g0.new/src/bzflag/bzflag.cxx Sun Mar 23 19:21:11 2003
5 #if !defined(_WIN32) & !defined(macintosh)
8 - struct passwd* pwent = getpwuid(getuid());
9 - if (pwent && pwent->pw_dir) {
10 - name += BzfString(pwent->pw_dir);
12 + char *etc_dir = getenv("ETC_DIR");
13 + if (etc_dir != NULL) {
14 + name += BzfString(etc_dir);
17 + struct passwd* pwent = getpwuid(getuid());
18 + if (pwent && pwent->pw_dir) {
19 + name += BzfString(pwent->pw_dir);
26 // add in hostname on UNIX
29 static BzfString getConfigFileName2()
32 - struct passwd* pwent = getpwuid(getuid());
33 - if (pwent && pwent->pw_dir) {
34 - name += BzfString(pwent->pw_dir);
36 + const char *etc_dir = getenv("ETC_DIR");
38 + name += BzfString(etc_dir);
41 + struct passwd* pwent = getpwuid(getuid());
42 + if (pwent && pwent->pw_dir) {
43 + name += BzfString(pwent->pw_dir);
52 diff -Nru bzflag-1.7g0/src/bzflag/playing.cxx bzflag-1.7g0.new/src/bzflag/playing.cxx
53 --- bzflag-1.7g0/src/bzflag/playing.cxx Sat Dec 7 08:25:08 2002
54 +++ bzflag-1.7g0.new/src/bzflag/playing.cxx Sun Mar 23 19:23:20 2003
55 @@ -3419,12 +3419,18 @@
59 - struct passwd *pwent = getpwuid(getuid());
60 - if (pwent && pwent->pw_dir) {
61 - name += BzfString(pwent->pw_dir);
63 + const char *etc_dir = getenv("ETC_DIR");
65 + name += BzfString(etc_dir);
66 + name += "/bzflag-cache";
68 + struct passwd *pwent = getpwuid(getuid());
69 + if (pwent && pwent->pw_dir) {
70 + name += BzfString(pwent->pw_dir);
73 + name += ".bzflag-cache";
75 - name += ".bzflag-cache";
77 // add in hostname on UNIX