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.49 by root, Mon Oct 12 14:00:57 2009 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 it under
9 * it under the terms of the GNU General Public License as published by 9 * the terms of the Affero GNU General Public License as published by the
10 * the Free Software Foundation, either version 3 of the License, or 10 * Free Software Foundation, either version 3 of the License, or (at your
11 * (at your option) any later version. 11 * 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,
14 * but WITHOUT ANY WARRANTY; without even the implied warranty of 14 * but WITHOUT ANY WARRANTY; without even the implied warranty of
15 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the 15 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
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 Affero GNU General Public License
19 * along with this program. If not, see <http://www.gnu.org/licenses/>. 19 * and the GNU General Public License along with this program. If not, see
20 * <http://www.gnu.org/licenses/>.
20 * 21 *
21 * The authors can be reached via e-mail to <crossfire@schmorp.de> 22 * The authors can be reached via e-mail to <support@deliantra.net>
22 */ 23 */
23 24
24#define EXTERN // horrible hack 25#define EXTERN // horrible hack
25 26
26#include <global.h> 27#include <global.h>
27#include <object.h> 28#include <object.h>
29
30dynbuf_text msg_dynbuf (65536, 65536);
28 31
29extern const char *const attacktype_desc[NROFATTACKS] = { 32extern const char *const attacktype_desc[NROFATTACKS] = {
30# define def(uc, lc, name, plus, change) # name, 33# define def(uc, lc, name, plus, change) # name,
31# include "attackinc.h" 34# include "attackinc.h"
32# undef def 35# undef def
… …
139 * overwrite these if specified. 142 * overwrite these if specified.
140 */ 143 */
141void 144void
142init_environ (void) 145init_environ (void)
143{ 146{
144 char *cp; 147 const char *cp;
145 148
146 cp = getenv ("CROSSFIRE_LIBDIR"); 149 if (cp = getenv ("DELIANTRA_CONFDIR" )) settings.confdir = cp;
147 if (cp) 150 if (cp = getenv ("DELIANTRA_LIBDIR" )) settings.datadir = cp;
148 settings.datadir = cp; 151 if (cp = getenv ("DELIANTRA_LOCALDIR" )) settings.localdir = cp;
152 if (cp = getenv ("DELIANTRA_PLAYERDIR" )) settings.playerdir = cp;
153 if (cp = getenv ("DELIANTRA_MAPDIR" )) settings.mapdir = cp;
154 if (cp = getenv ("DELIANTRA_ARCHETYPES" )) settings.archetypes = cp;
155 if (cp = getenv ("DELIANTRA_TREASURES" )) settings.treasures = cp;
156 if (cp = getenv ("DELIANTRA_UNIQUEDIR" )) settings.uniquedir = cp;
157 if (cp = getenv ("DELIANTRA_TEMPLATEDIR")) settings.templatedir = cp;
158 if (cp = getenv ("DELIANTRA_TMPDIR" )) settings.tmpdir = cp;
149 159
150 cp = getenv ("CROSSFIRE_LOCALDIR"); 160 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} 161}
182 162
183/* 163/*
184 * Initialises all global variables. 164 * Initialises all global variables.
185 * Might use environment-variables as default for some of them. 165 * Might use environment-variables as default for some of them.
186 */ 166 */
187void 167void
188init_globals (void) 168init_globals (void)
189{ 169{
190 if (settings.logfilename[0] == 0) 170 if (settings.logfilename[0] == 0)
191 logfile = stderr; 171 set_logfd (-1);
192 else if ((logfile = fopen (settings.logfilename, "a")) == NULL) 172 else
193 { 173 {
174 int logfd = open (settings.logfilename, O_CREAT|O_WRONLY|O_APPEND, 0666);
175
176 if (logfd >= 0)
177 set_logfd (logfd);
178 else
179 {
180 set_logfd (-1);
194 fprintf (stderr, "Unable to open %s as the logfile - will use stderr instead\n", settings.logfilename); 181 LOG (llevError, "Unable to open %s as the logfile - will use stderr instead", settings.logfilename);
195 logfile = stderr; 182 }
196 } 183 }
197 else
198 setvbuf (logfile, NULL, _IOLBF, 0);
199} 184}
200 185
201void 186void
202init_dynamic (void) 187init_dynamic (void)
203{ 188{
… …
239 level = 0; 224 level = 0;
240 while (fgets (buf, MAX_BUF, fp) != NULL) 225 while (fgets (buf, MAX_BUF, fp) != NULL)
241 { 226 {
242 if (*buf == '#') 227 if (*buf == '#')
243 continue; 228 continue;
229
244 if ((cp = strchr (buf, '\n')) != NULL) 230 if ((cp = strchr (buf, '\n')) != NULL)
245 *cp = '\0'; 231 *cp = '\0';
232
246 cp = buf; 233 cp = buf;
247 while (*cp == ' ') /* Skip blanks */ 234 while (*cp == ' ') /* Skip blanks */
248 cp++; 235 cp++;
249 236
250 if (strncmp (cp, "TYPE:", 5) == 0) 237 if (strncmp (cp, "TYPE:", 5) == 0)
… …
256 attack_mess[mess][level].level = -1; 243 attack_mess[mess][level].level = -1;
257 attack_mess[mess][level].buf1 = NULL; 244 attack_mess[mess][level].buf1 = NULL;
258 attack_mess[mess][level].buf2 = NULL; 245 attack_mess[mess][level].buf2 = NULL;
259 attack_mess[mess][level].buf3 = NULL; 246 attack_mess[mess][level].buf3 = NULL;
260 } 247 }
248
261 level = 0; 249 level = 0;
262 mess = atoi (p); 250 mess = atoi (p);
263 mode = 1; 251 mode = 1;
264 continue; 252 continue;
265 } 253 }
254
266 if (mode == 1) 255 if (mode == 1)
267 { 256 {
268 p = strtok (buf, "="); 257 p = strtok (buf, "=");
269 attack_mess[mess][level].level = atoi (buf); 258 attack_mess[mess][level].level = atoi (buf);
270 p = strtok (NULL, "="); 259 p = strtok (NULL, "=");
… …
300 level++; 289 level++;
301 total++; 290 total++;
302 continue; 291 continue;
303 } 292 }
304 } 293 }
294
305 LOG (llevDebug, "got %d messages in %d categories.\n", total, mess + 1); 295 LOG (llevDebug, "got %d messages in %d categories.\n", total, mess + 1);
306 close_and_delete (fp, comp); 296 close_and_delete (fp, comp);
307} 297}
298

Diff Legend

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