]>
Commit | Line | Data |
---|---|---|
4869ddf7 JK |
1 | diff -durN crossfire-1.1.0.orig/include/config.h crossfire-1.1.0/include/config.h |
2 | --- crossfire-1.1.0.orig/include/config.h Wed Mar 20 07:36:53 2002 | |
3 | +++ crossfire-1.1.0/include/config.h Fri Mar 22 13:23:04 2002 | |
4 | @@ -654,7 +654,7 @@ | |
4a1c5fe8 JK |
5 | #ifdef WIN32 /* change define path */ |
6 | #define LOGFILE "tmp\\cross.log" | |
7 | #else | |
49deffe3 JK |
8 | -#define LOGFILE "/tmp/cross.log" |
9 | +#define LOGFILE "/var/log/crossfire" | |
10 | #endif | |
4a1c5fe8 | 11 | #endif |
49deffe3 | 12 | |
4869ddf7 | 13 | @@ -821,7 +821,7 @@ |
4a1c5fe8 JK |
14 | #ifdef WIN32 /* change define path tmp */ |
15 | #define TMPDIR "tmp" | |
16 | #else | |
49deffe3 JK |
17 | -#define TMPDIR "/tmp" |
18 | +#define TMPDIR "/var/lib/crossfire/tmp" | |
4a1c5fe8 | 19 | #endif |
49deffe3 JK |
20 | |
21 | ||
4869ddf7 JK |
22 | diff -durN crossfire-1.1.0.orig/server/ban.c crossfire-1.1.0/server/ban.c |
23 | --- crossfire-1.1.0.orig/server/ban.c Wed Mar 20 07:36:53 2002 | |
24 | +++ crossfire-1.1.0/server/ban.c Fri Mar 22 13:23:04 2002 | |
25 | @@ -34,7 +34,7 @@ | |
6dcb1478 JK |
26 | int num1; |
27 | int Hits=0; /* Hits==2 means we're banned */ | |
28 | ||
29 | - sprintf (buf, "%s/%s", settings.datadir, BANFILE); | |
30 | + sprintf (buf, "%s/%s", "/etc/crossfire", BANFILE); | |
31 | if ((bannedfile = fopen(buf, "r")) == NULL) { | |
32 | LOG (llevDebug, "Could not find file Banned file.\n"); | |
33 | return(0); | |
4869ddf7 JK |
34 | diff -durN crossfire-1.1.0.orig/server/c_wiz.c crossfire-1.1.0/server/c_wiz.c |
35 | --- crossfire-1.1.0.orig/server/c_wiz.c Wed Mar 20 07:36:53 2002 | |
36 | +++ crossfire-1.1.0/server/c_wiz.c Fri Mar 22 13:23:04 2002 | |
37 | @@ -889,7 +889,7 @@ | |
6dcb1478 JK |
38 | *pl_name=op->name?op->name:"*"; |
39 | #endif | |
40 | ||
41 | - sprintf (buf, "%s/%s", settings.datadir, DMFILE); | |
42 | + sprintf (buf, "%s/%s", "/etc/crossfire", DMFILE); | |
43 | if ((dmfile = fopen(buf, "r")) == NULL) { | |
44 | LOG (llevDebug, "Could not find DM file.\n"); | |
45 | return(0); | |
4869ddf7 JK |
46 | diff -durN crossfire-1.1.0.orig/server/init.c crossfire-1.1.0/server/init.c |
47 | --- crossfire-1.1.0.orig/server/init.c Wed Mar 20 07:36:53 2002 | |
48 | +++ crossfire-1.1.0/server/init.c Fri Mar 22 13:23:04 2002 | |
49 | @@ -225,7 +225,7 @@ | |
6dcb1478 JK |
50 | int has_val,comp; |
51 | FILE *fp; | |
52 | ||
53 | - sprintf(buf,"%s/settings",settings.datadir); | |
54 | + sprintf(buf,"%s/settings","/etc/crossfire"); | |
55 | /* We don't require a settings file at current time, but down the road, | |
56 | * there will probably be so many values that not having a settings file | |
57 | * will not be a good thing. | |
4869ddf7 | 58 | @@ -504,7 +504,7 @@ |
6dcb1478 JK |
59 | int comp; |
60 | ||
61 | #ifdef SHUTDOWN_FILE | |
62 | - sprintf(buf,"%s/%s",settings.datadir,SHUTDOWN_FILE); | |
63 | + sprintf(buf,"%s/%s","/etc/crossfire",SHUTDOWN_FILE); | |
64 | if ((fp = open_and_uncompress(buf, 0, &comp)) != NULL) { | |
65 | while (fgets(buf, MAX_BUF-1, fp) != NULL) | |
66 | printf("%s", buf); | |
4869ddf7 | 67 | @@ -558,10 +558,10 @@ |
6dcb1478 JK |
68 | printf("Datadir:\t\t%s\n",settings.datadir); |
69 | printf("Localdir:\t\t%s\n",settings.localdir); | |
70 | #ifdef PERM_FILE | |
71 | - printf("Perm file:\t<LIB>/%s\n",PERM_FILE); | |
72 | + printf("Perm file:\t/etc/crossfire/%s\n",PERM_FILE); | |
73 | #endif | |
74 | #ifdef SHUTDOWN_FILE | |
75 | - printf("Shutdown file:\t<LIB>/%s\n",SHUTDOWN_FILE); | |
76 | + printf("Shutdown file:\t/etc/crossfire/%s\n",SHUTDOWN_FILE); | |
77 | #endif | |
78 | printf("Save player:\t<true>\n"); | |
79 | printf("Save mode:\t%4.4o\n",SAVE_MODE); | |
4869ddf7 JK |
80 | diff -durN crossfire-1.1.0.orig/server/main.c crossfire-1.1.0/server/main.c |
81 | --- crossfire-1.1.0.orig/server/main.c Wed Mar 20 07:36:53 2002 | |
82 | +++ crossfire-1.1.0/server/main.c Fri Mar 22 13:23:43 2002 | |
83 | @@ -30,6 +30,7 @@ | |
49deffe3 JK |
84 | #include <global.h> |
85 | #include <object.h> | |
4869ddf7 | 86 | #include <tod.h> |
49deffe3 JK |
87 | +#include <config.h> |
88 | ||
89 | #ifdef HAVE_DES_H | |
90 | #include <des.h> | |
4869ddf7 | 91 | @@ -1043,7 +1044,7 @@ |
6dcb1478 JK |
92 | clock = time (NULL); |
93 | tm = (struct tm *) localtime (&clock); | |
94 | ||
95 | - sprintf (buf, "%s/%s", settings.datadir, PERM_FILE); | |
96 | + sprintf (buf, "%s/%s", "/etc/crossfire", PERM_FILE); | |
97 | if ((fp = open_and_uncompress(buf, 0, &comp)) == NULL) | |
98 | return 0; | |
99 | ||
4869ddf7 JK |
100 | diff -durN crossfire-1.1.0.orig/server/player.c crossfire-1.1.0/server/player.c |
101 | --- crossfire-1.1.0.orig/server/player.c Wed Mar 20 07:36:53 2002 | |
102 | +++ crossfire-1.1.0/server/player.c Fri Mar 22 13:23:04 2002 | |
103 | @@ -57,7 +57,7 @@ | |
6dcb1478 JK |
104 | FILE *fp; |
105 | int comp; | |
106 | ||
107 | - sprintf(buf,"%s/%s",settings.datadir,MOTD); | |
108 | + sprintf(buf,"%s/%s","/etc/crossfire",MOTD); | |
109 | if((fp=open_and_uncompress(buf,0,&comp))==NULL) { | |
110 | return; | |
111 | } |