ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/deliantra/server/common/init.C
(Generate patch)

Comparing deliantra/server/common/init.C (file contents):
Revision 1.40 by root, Mon Aug 20 22:09:04 2007 UTC vs.
Revision 1.46 by root, Tue Sep 23 04:29:11 2008 UTC

1/* 1/*
2 * This file is part of Crossfire TRT, the Roguelike Realtime MORPG. 2 * This file is part of Deliantra, the Roguelike Realtime MMORPG.
3 * 3 *
4 * Copyright (©) 2005,2006,2007 Marc Alexander Lehmann / Robin Redeker / the Crossfire TRT team 4 * Copyright (©) 2005,2006,2007,2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
5 * Copyright (©) 2002,2007 Mark Wedel & Crossfire Development Team 5 * Copyright (©) 2002,2007 Mark Wedel & Crossfire Development Team
6 * Copyright (©) 1992,2007 Frank Tore Johansen 6 * Copyright (©) 1992,2007 Frank Tore Johansen
7 * 7 *
8 * Crossfire TRT is free software: you can redistribute it and/or modify 8 * Deliantra is free software: you can redistribute it and/or modify
9 * it under the terms of the GNU General Public License as published by 9 * it under the terms of the GNU General Public License as published by
10 * the Free Software Foundation, either version 3 of the License, or 10 * the Free Software Foundation, either version 3 of the License, or
11 * (at your option) any later version. 11 * (at your option) any later version.
12 * 12 *
13 * This program is distributed in the hope that it will be useful, 13 * This program is distributed in the hope that it will be useful,
… …
16 * GNU General Public License for more details. 16 * GNU General Public License for more details.
17 * 17 *
18 * You should have received a copy of the GNU General Public License 18 * You should have received a copy of the GNU General Public License
19 * along with this program. If not, see <http://www.gnu.org/licenses/>. 19 * along with this program. If not, see <http://www.gnu.org/licenses/>.
20 * 20 *
21 * The authors can be reached via e-mail to <crossfire@schmorp.de> 21 * The authors can be reached via e-mail to <support@deliantra.net>
22 */ 22 */
23 23
24#define EXTERN // horrible hack 24#define EXTERN // horrible hack
25 25
26#include <global.h> 26#include <global.h>
… …
139 * overwrite these if specified. 139 * overwrite these if specified.
140 */ 140 */
141void 141void
142init_environ (void) 142init_environ (void)
143{ 143{
144 char *cp; 144 const char *cp;
145 145
146 cp = getenv ("CROSSFIRE_LIBDIR"); 146 if (cp = getenv ("DELIANTRA_CONFDIR" )) settings.datadir = cp;
147 if (cp) 147 if (cp = getenv ("DELIANTRA_LIBDIR" )) settings.datadir = cp;
148 settings.datadir = cp; 148 if (cp = getenv ("DELIANTRA_LOCALDIR" )) settings.localdir = cp;
149 if (cp = getenv ("DELIANTRA_PLAYERDIR" )) settings.playerdir = cp;
150 if (cp = getenv ("DELIANTRA_MAPDIR" )) settings.mapdir = cp;
151 if (cp = getenv ("DELIANTRA_ARCHETYPES" )) settings.archetypes = cp;
152 if (cp = getenv ("DELIANTRA_TREASURES" )) settings.treasures = cp;
153 if (cp = getenv ("DELIANTRA_UNIQUEDIR" )) settings.uniquedir = cp;
154 if (cp = getenv ("DELIANTRA_TEMPLATEDIR")) settings.templatedir = cp;
155 if (cp = getenv ("DELIANTRA_TMPDIR" )) settings.tmpdir = cp;
149 156
150 cp = getenv ("CROSSFIRE_LOCALDIR"); 157 if (cp = getenv ("DELIANTRA_LOGFILE" )) settings.logfilename = cp;
151 if (cp)
152 settings.localdir = cp;
153
154 cp = getenv ("CROSSFIRE_PLAYERDIR");
155 if (cp)
156 settings.playerdir = cp;
157
158 cp = getenv ("CROSSFIRE_MAPDIR");
159 if (cp)
160 settings.mapdir = cp;
161
162 cp = getenv ("CROSSFIRE_ARCHETYPES");
163 if (cp)
164 settings.archetypes = cp;
165
166 cp = getenv ("CROSSFIRE_TREASURES");
167 if (cp)
168 settings.treasures = cp;
169
170 cp = getenv ("CROSSFIRE_UNIQUEDIR");
171 if (cp)
172 settings.uniquedir = cp;
173
174 cp = getenv ("CROSSFIRE_TEMPLATEDIR");
175 if (cp)
176 settings.templatedir = cp;
177
178 cp = getenv ("CROSSFIRE_TMPDIR");
179 if (cp)
180 settings.tmpdir = cp;
181} 158}
182 159
183/* 160/*
184 * Initialises all global variables. 161 * Initialises all global variables.
185 * Might use environment-variables as default for some of them. 162 * Might use environment-variables as default for some of them.
186 */ 163 */
187void 164void
188init_globals (void) 165init_globals (void)
189{ 166{
190 if (settings.logfilename[0] == 0) 167 if (settings.logfilename[0] == 0)
191 logfile = stderr; 168 set_logfd (-1);
192 else if ((logfile = fopen (settings.logfilename, "a")) == NULL) 169 else
193 { 170 {
171 int logfd = open (settings.logfilename, O_CREAT|O_WRONLY|O_APPEND, 0666);
172
173 if (logfd >= 0)
174 set_logfd (logfd);
175 else
176 {
177 set_logfd (-1);
194 fprintf (stderr, "Unable to open %s as the logfile - will use stderr instead\n", settings.logfilename); 178 LOG (llevError, "Unable to open %s as the logfile - will use stderr instead", settings.logfilename);
195 logfile = stderr; 179 }
196 } 180 }
197 else
198 setvbuf (logfile, NULL, _IOLBF, 0);
199} 181}
200 182
201void 183void
202init_dynamic (void) 184init_dynamic (void)
203{ 185{
… …
239 level = 0; 221 level = 0;
240 while (fgets (buf, MAX_BUF, fp) != NULL) 222 while (fgets (buf, MAX_BUF, fp) != NULL)
241 { 223 {
242 if (*buf == '#') 224 if (*buf == '#')
243 continue; 225 continue;
226
244 if ((cp = strchr (buf, '\n')) != NULL) 227 if ((cp = strchr (buf, '\n')) != NULL)
245 *cp = '\0'; 228 *cp = '\0';
229
246 cp = buf; 230 cp = buf;
247 while (*cp == ' ') /* Skip blanks */ 231 while (*cp == ' ') /* Skip blanks */
248 cp++; 232 cp++;
249 233
250 if (strncmp (cp, "TYPE:", 5) == 0) 234 if (strncmp (cp, "TYPE:", 5) == 0)
… …
256 attack_mess[mess][level].level = -1; 240 attack_mess[mess][level].level = -1;
257 attack_mess[mess][level].buf1 = NULL; 241 attack_mess[mess][level].buf1 = NULL;
258 attack_mess[mess][level].buf2 = NULL; 242 attack_mess[mess][level].buf2 = NULL;
259 attack_mess[mess][level].buf3 = NULL; 243 attack_mess[mess][level].buf3 = NULL;
260 } 244 }
245
261 level = 0; 246 level = 0;
262 mess = atoi (p); 247 mess = atoi (p);
263 mode = 1; 248 mode = 1;
264 continue; 249 continue;
265 } 250 }
251
266 if (mode == 1) 252 if (mode == 1)
267 { 253 {
268 p = strtok (buf, "="); 254 p = strtok (buf, "=");
269 attack_mess[mess][level].level = atoi (buf); 255 attack_mess[mess][level].level = atoi (buf);
270 p = strtok (NULL, "="); 256 p = strtok (NULL, "=");
… …
300 level++; 286 level++;
301 total++; 287 total++;
302 continue; 288 continue;
303 } 289 }
304 } 290 }
291
305 LOG (llevDebug, "got %d messages in %d categories.\n", total, mess + 1); 292 LOG (llevDebug, "got %d messages in %d categories.\n", total, mess + 1);
306 close_and_delete (fp, comp); 293 close_and_delete (fp, comp);
307} 294}
295

Diff Legend

– Removed lines
+ Added lines
< Changed lines
> Changed lines