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.44 by root, Tue Apr 15 03:16:02 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>
… …
141void 141void
142init_environ (void) 142init_environ (void)
143{ 143{
144 char *cp; 144 char *cp;
145 145
146 cp = getenv ("CROSSFIRE_LIBDIR"); 146 cp = getenv ("DELIANTRA_LIBDIR");
147 if (cp) 147 if (cp)
148 settings.datadir = cp; 148 settings.datadir = cp;
149 149
150 cp = getenv ("CROSSFIRE_LOCALDIR"); 150 cp = getenv ("DELIANTRA_LOCALDIR");
151 if (cp) 151 if (cp)
152 settings.localdir = cp; 152 settings.localdir = cp;
153 153
154 cp = getenv ("CROSSFIRE_PLAYERDIR"); 154 cp = getenv ("DELIANTRA_PLAYERDIR");
155 if (cp) 155 if (cp)
156 settings.playerdir = cp; 156 settings.playerdir = cp;
157 157
158 cp = getenv ("CROSSFIRE_MAPDIR"); 158 cp = getenv ("DELIANTRA_MAPDIR");
159 if (cp) 159 if (cp)
160 settings.mapdir = cp; 160 settings.mapdir = cp;
161 161
162 cp = getenv ("CROSSFIRE_ARCHETYPES"); 162 cp = getenv ("DELIANTRA_ARCHETYPES");
163 if (cp) 163 if (cp)
164 settings.archetypes = cp; 164 settings.archetypes = cp;
165 165
166 cp = getenv ("CROSSFIRE_TREASURES"); 166 cp = getenv ("DELIANTRA_TREASURES");
167 if (cp) 167 if (cp)
168 settings.treasures = cp; 168 settings.treasures = cp;
169 169
170 cp = getenv ("CROSSFIRE_UNIQUEDIR"); 170 cp = getenv ("DELIANTRA_UNIQUEDIR");
171 if (cp) 171 if (cp)
172 settings.uniquedir = cp; 172 settings.uniquedir = cp;
173 173
174 cp = getenv ("CROSSFIRE_TEMPLATEDIR"); 174 cp = getenv ("DELIANTRA_TEMPLATEDIR");
175 if (cp) 175 if (cp)
176 settings.templatedir = cp; 176 settings.templatedir = cp;
177 177
178 cp = getenv ("CROSSFIRE_TMPDIR"); 178 cp = getenv ("DELIANTRA_TMPDIR");
179 if (cp) 179 if (cp)
180 settings.tmpdir = cp; 180 settings.tmpdir = cp;
181} 181}
182 182
183/* 183/*
… …
186 */ 186 */
187void 187void
188init_globals (void) 188init_globals (void)
189{ 189{
190 if (settings.logfilename[0] == 0) 190 if (settings.logfilename[0] == 0)
191 logfile = stderr; 191 set_logfd (-1);
192 else if ((logfile = fopen (settings.logfilename, "a")) == NULL) 192 else
193 { 193 {
194 int logfd = open (settings.logfilename, O_CREAT|O_WRONLY|O_APPEND, 0666);
195
196 if (logfd >= 0)
197 set_logfd (logfd);
198 else
199 {
200 set_logfd (-1);
194 fprintf (stderr, "Unable to open %s as the logfile - will use stderr instead\n", settings.logfilename); 201 LOG (llevError, "Unable to open %s as the logfile - will use stderr instead", settings.logfilename);
195 logfile = stderr; 202 }
196 } 203 }
197 else
198 setvbuf (logfile, NULL, _IOLBF, 0);
199} 204}
200 205
201void 206void
202init_dynamic (void) 207init_dynamic (void)
203{ 208{

Diff Legend

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