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

Comparing deliantra/server/server/init.C (file contents):
Revision 1.21 by root, Wed Dec 20 09:14:22 2006 UTC vs.
Revision 1.28 by pippijn, Wed Jan 3 00:46:53 2007 UTC

… …
22*/ 22*/
23 23
24#include <global.h> 24#include <global.h>
25#include <material.h> 25#include <material.h>
26#include <loader.h> 26#include <loader.h>
27#ifndef __CEXTRACT__
28# include <sproto.h> 27#include <sproto.h>
29#endif
30
31/* global weathermap */
32weathermap_t **weathermap;
33 28
34void 29void
35set_logfile (char *val) 30set_logfile (char *val)
36{ 31{
37 settings.logfilename = val; 32 settings.logfilename = val;
… …
241 * pass system very easy, and it is very easy to add in new options. 236 * pass system very easy, and it is very easy to add in new options.
242 */ 237 */
243struct Command_Line_Options options[] = { 238struct Command_Line_Options options[] = {
244 239
245/* Pass 1 functions - STuff that can/should be called before we actually 240/* Pass 1 functions - STuff that can/should be called before we actually
246 * initialize any data. 241 * initialise any data.
247 */ 242 */
248 {"-h", 0, 1, help}, 243 {"-h", 0, 1, help},
249 244
250/* Honor -help also, since it is somewhat common */ 245/* Honor -help also, since it is somewhat common */
251 {"-help", 0, 1, help}, 246 {"-help", 0, 1, help},
… …
384 FILE *fp; 379 FILE *fp;
385 materialtype_t *mt; 380 materialtype_t *mt;
386 int i, value; 381 int i, value;
387 382
388 sprintf (filename, "%s/materials", settings.datadir); 383 sprintf (filename, "%s/materials", settings.datadir);
389 LOG (llevDebug, "Reading material type data from %s...", filename); 384 LOG (llevDebug, "Reading material type data from %s...\n", filename);
390 if ((fp = fopen (filename, "r")) == NULL) 385 if ((fp = fopen (filename, "r")) == NULL)
391 { 386 {
392 LOG (llevError, "Cannot open %s for reading\n", filename); 387 LOG (llevError, "Cannot open %s for reading\n", filename);
393 mt = get_empty_mat (); 388 mt = get_empty_mat ();
394 mt->next = NULL; 389 mt->next = NULL;
… …
1015 * LibDir in this pass would be reasonable*/ 1010 * LibDir in this pass would be reasonable*/
1016 1011
1017 cfperl_init (); 1012 cfperl_init ();
1018 init_library (); /* Must be called early */ 1013 init_library (); /* Must be called early */
1019 load_settings (); /* Load the settings file */ 1014 load_settings (); /* Load the settings file */
1020 init_weather ();
1021 load_materials (); 1015 load_materials ();
1022 parse_args (argc, argv, 2); 1016 parse_args (argc, argv, 2);
1023 fprintf (logfile, "Welcome to CrossFire, v%s\n", VERSION); 1017 fprintf (logfile, "Welcome to CrossFire, v%s\n", VERSION);
1018 fprintf (logfile, "Copyright (C) 2005, 2006, 2007 Marc Lehmann.\n");
1024 fprintf (logfile, "Copyright (C) 1994 Mark Wedel.\n"); 1019 fprintf (logfile, "Copyright (C) 1994 Mark Wedel.\n");
1025 fprintf (logfile, "Copyright (C) 1992 Frank Tore Johansen.\n"); 1020 fprintf (logfile, "Copyright (C) 1992 Frank Tore Johansen.\n");
1026 1021
1027 if (strcmp (settings.dm_mail, "") != 0) 1022 if (strcmp (settings.dm_mail, "") != 0)
1028 { 1023 {
… …
1034 1029
1035 init_startup (); /* Write (C), check shutdown/forbid files */ 1030 init_startup (); /* Write (C), check shutdown/forbid files */
1036 init_uuid (); 1031 init_uuid ();
1037 init_signals (); /* Sets up signal interceptions */ 1032 init_signals (); /* Sets up signal interceptions */
1038 init_commands (); /* Sort command tables */ 1033 init_commands (); /* Sort command tables */
1039 read_map_log (); /* Load up the old temp map files */
1040 init_skills (); 1034 init_skills ();
1041 1035
1042 parse_args (argc, argv, 3); 1036 parse_args (argc, argv, 3);
1043 1037
1044 if (settings.daemonmode) 1038 if (settings.daemonmode)
… …
1214 printf ("Save player:\t<true>\n"); 1208 printf ("Save player:\t<true>\n");
1215 printf ("Save mode:\t%4.4o\n", SAVE_MODE); 1209 printf ("Save mode:\t%4.4o\n", SAVE_MODE);
1216 printf ("Playerdir:\t<VAR>/%s\n", settings.playerdir); 1210 printf ("Playerdir:\t<VAR>/%s\n", settings.playerdir);
1217 printf ("Itemsdir:\t<VAR>/%s\n", settings.uniquedir); 1211 printf ("Itemsdir:\t<VAR>/%s\n", settings.uniquedir);
1218 printf ("Tmpdir:\t\t%s\n", settings.tmpdir); 1212 printf ("Tmpdir:\t\t%s\n", settings.tmpdir);
1219 printf ("Map max timeout:\t%d\n", MAP_MAXTIMEOUT);
1220 printf ("Max objects:\t%d\n", MAX_OBJECTS);
1221#ifdef USE_CALLOC 1213#ifdef USE_CALLOC
1222 printf ("Use_calloc:\t<true>\n"); 1214 printf ("Use_calloc:\t<true>\n");
1223#else 1215#else
1224 printf ("Use_calloc:\t<false>\n"); 1216 printf ("Use_calloc:\t<false>\n");
1225#endif 1217#endif
… …
1255rec_sighup (int i) 1247rec_sighup (int i)
1256{ 1248{
1257 LOG (llevInfo, "SIGHUP received\n"); 1249 LOG (llevInfo, "SIGHUP received\n");
1258 1250
1259 if (init_done) 1251 if (init_done)
1260 cleanup (); 1252 cleanup (0);
1261 1253
1262 exit (0); 1254 exit (0);
1263} 1255}
1264 1256
1265void 1257void
… …
1323 return; 1315 return;
1324 init_done = 1; 1316 init_done = 1;
1325 first_race = 0; 1317 first_race = 0;
1326 1318
1327 sprintf (fname, "%s/races", settings.datadir); 1319 sprintf (fname, "%s/races", settings.datadir);
1328 LOG (llevDebug, "Reading races from %s...", fname); 1320 LOG (llevDebug, "Reading races from %s...\n", fname);
1329 if (!(file = fopen (fname, "r"))) 1321 if (!(file = fopen (fname, "r")))
1330 { 1322 {
1331 LOG (llevError, "Cannot open races file %s: %s\n", fname, strerror (errno)); 1323 LOG (llevError, "Cannot open races file %s: %s\n", fname, strerror (errno));
1332 return; 1324 return;
1333 } 1325 }
… …
1374 if (cp[strlen (cp) - 1] == '\n') 1366 if (cp[strlen (cp) - 1] == '\n')
1375 cp[strlen (cp) - 1] = '\0'; 1367 cp[strlen (cp) - 1] = '\0';
1376 1368
1377 /* set creature race to race value */ 1369 /* set creature race to race value */
1378 if ((mon = archetype::find (cp)) == NULL) 1370 if ((mon = archetype::find (cp)) == NULL)
1379 LOG (llevError, "\nCreature %s in race file lacks archetype", cp); 1371 LOG (llevError, "Creature %s in race file lacks archetype\n", cp);
1380 else 1372 else
1381 { 1373 {
1382 if (set_race && (!mon->clone.race || strcmp (mon->clone.race, race))) 1374 if (set_race && (!mon->clone.race || strcmp (mon->clone.race, race)))
1383 { 1375 {
1384 if (mon->clone.race) 1376 if (mon->clone.race)
1385 LOG (llevDebug, "\n Resetting race to %s from %s for archetype %s", race, &mon->clone.race, &mon->name); 1377 LOG (llevDebug, "Resetting race to %s from %s for archetype %s\n", race, &mon->clone.race, &mon->name);
1386 1378
1387 mon->clone.race = race; 1379 mon->clone.race = race;
1388 } 1380 }
1389 1381
1390 /* if the arch is a monster, add it to the race list */ 1382 /* if the arch is a monster, add it to the race list */

Diff Legend

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