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.38 by root, Wed Jan 24 16:36:10 2007 UTC vs.
Revision 1.61 by root, Thu Apr 10 15:35:16 2008 UTC

1/* 1/*
2 * CrossFire, A Multiplayer game 2 * This file is part of Deliantra, the Roguelike Realtime MMORPG.
3 * 3 *
4 * Copyright (C) 2005, 2006, 2007 Marc Lehmann & Crossfire+ Development Team 4 * Copyright (©) 2005,2006,2007 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
5 * Copyright (C) 2002 Mark Wedel & Crossfire Development Team 5 * Copyright (©) 2002,2007 Mark Wedel & Crossfire Development Team
6 * Copyright (C) 1992 Frank Tore Johansen 6 * Copyright (©) 1992,2007 Frank Tore Johansen
7 * 7 *
8 * This program 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 2 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,
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 GNU General Public License
19 * along with this program; if not, write to the Free Software 19 * along with this program. If not, see <http://www.gnu.org/licenses/>.
20 * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
21 * 20 *
22 * The authors can be reached via e-mail at <crossfire@schmorp.de> 21 * The authors can be reached via e-mail to <support@deliantra.net>
23 */ 22 */
24 23
25#include <global.h> 24#include <global.h>
26#include <material.h> 25#include <material.h>
27#include <loader.h> 26#include <loader.h>
… …
269 {"-detach", 0, 2, set_daemon}, 268 {"-detach", 0, 2, set_daemon},
270 269
271/* Start of pass 3 information. In theory, by pass 3, all data paths 270/* Start of pass 3 information. In theory, by pass 3, all data paths
272 * and defaults should have been set up. 271 * and defaults should have been set up.
273 */ 272 */
274 {"-o", 0, 3, compile_info},
275 {"-m", 0, 3, set_dumpmon1}, 273 {"-m", 0, 3, set_dumpmon1},
276 {"-m2", 0, 3, set_dumpmon2}, 274 {"-m2", 0, 3, set_dumpmon2},
277 {"-m3", 0, 3, set_dumpmon3}, 275 {"-m3", 0, 3, set_dumpmon3},
278 {"-m4", 0, 3, set_dumpmon4}, 276 {"-m4", 0, 3, set_dumpmon4},
279 {"-m5", 0, 3, set_dumpmon5}, 277 {"-m5", 0, 3, set_dumpmon5},
… …
287 {"-score", 1, 3, (void (*)()) showscoresparm} 285 {"-score", 1, 3, (void (*)()) showscoresparm}
288}; 286};
289 287
290 288
291/* Note since this may be called before the library has been set up, 289/* Note since this may be called before the library has been set up,
292 * we don't use any of crossfires built in logging functions. 290 * we don't use any of deliantras built in logging functions.
293 */ 291 */
294static void 292static void
295parse_args (int argc, char *argv[], int pass) 293parse_args (int argc, char *argv[], int pass)
296{ 294{
297 size_t i; 295 size_t i;
… …
374} 372}
375 373
376static void 374static void
377load_materials (void) 375load_materials (void)
378{ 376{
379 char buf[MAX_BUF], filename[MAX_BUF], *cp, *next; 377 char filename[MAX_BUF];
380 FILE *fp;
381 materialtype_t *mt; 378 materialtype_t *mt;
382 int i, value;
383 379
384 sprintf (filename, "%s/materials", settings.datadir); 380 sprintf (filename, "%s/materials", settings.datadir);
385 LOG (llevDebug, "Reading material type data from %s...\n", filename); 381 LOG (llevDebug, "Reading material type data from %s...\n", filename);
386 if ((fp = fopen (filename, "r")) == NULL) 382
383 object_thawer thawer (filename);
384
385 if (!thawer)
387 { 386 {
388 LOG (llevError, "Cannot open %s for reading\n", filename); 387 LOG (llevError, "Cannot open %s for reading\n", filename);
389 mt = get_empty_mat (); 388 mt = get_empty_mat ();
390 mt->next = NULL; 389 mt->next = 0;
391 materialt = mt; 390 materialt = mt;
392 return; 391 return;
393 } 392 }
393
394 mt = get_empty_mat (); 394 mt = get_empty_mat ();
395 materialt = mt; 395 materialt = mt;
396 while (fgets (buf, MAX_BUF, fp) != NULL) 396
397 for (;;)
397 { 398 {
398 if (*buf == '#') 399 thawer.next ();
399 continue; 400
400 if ((cp = strchr (buf, '\n')) != NULL) 401 switch (thawer.kw)
401 *cp = '\0';
402 cp = buf;
403 while (*cp == ' ') /* Skip blanks */
404 cp++;
405 if (!strncmp (cp, "name", 4))
406 { 402 {
403 case KW_name:
407 /* clean up the previous entry */ 404 /* clean up the previous entry */
408 if (mt->next != NULL) 405 if (mt->next)
409 { 406 {
410 if (mt->description == NULL) 407 if (!mt->description)
411 mt->description = mt->name; 408 mt->description = mt->name;
409
412 mt = mt->next; 410 mt = mt->next;
413 } 411 }
412
414 mt->next = get_empty_mat (); 413 mt->next = get_empty_mat ();
415 mt->name = strchr (cp, ' ') + 1; 414 thawer.get (mt->name);
416 } 415 break;
417 else if (!strncmp (cp, "description", 11)) 416
417 case KW_description:
418 thawer.get (mt->description);
419 break;
420
421 case KW_material:
422 thawer.get (mt->material);
423 break;
424
425 case KW_saves:
418 { 426 {
419 mt->description = strchr (cp, ' ') + 1; 427 const char *cp = thawer.get_str () - 1;
420 } 428
421 else if (sscanf (cp, "material %d", &value))
422 {
423 mt->material = value;
424 }
425 else if (!strncmp (cp, "saves", 5))
426 {
427 cp = strchr (cp, ' ') + 1;
428 for (i = 0; i < NROFATTACKS; i++) 429 for (int i = 0; i < NROFATTACKS; i++)
429 {
430 if (cp == NULL)
431 { 430 {
431 if (!cp)
432 {
432 mt->save[i] = 0; 433 mt->save[i] = 0;
433 continue; 434 continue;
435 }
436
437 int value;
438 ++cp;
439 sscanf (cp, "%d", &value);
440 mt->save[i] = (sint8) value;
441 cp = strchr (cp, ',');
434 } 442 }
435 if ((next = strchr (cp, ',')) != NULL)
436 *(next++) = '\0';
437 sscanf (cp, "%d", &value);
438 mt->save[i] = (sint8) value;
439 cp = next;
440 }
441 }
442 else if (!strncmp (cp, "mods", 4))
443 {
444 cp = strchr (cp, ' ') + 1;
445 for (i = 0; i < NROFATTACKS; i++)
446 { 443 }
447 if (cp == NULL) 444 break;
445
446 case KW_mods:
447 {
448 const char *cp = thawer.get_str () - 1;
449
450 for (int i = 0; i < NROFATTACKS; i++)
448 { 451 {
452 if (!cp)
453 {
449 mt->save[i] = 0; 454 mt->save[i] = 0;
450 continue; 455 continue;
456 }
457
458 ++cp;
459 int value;
460 sscanf (cp, "%d", &value);
461 mt->mod[i] = (sint8) value;
462 cp = strchr (cp, ',');
451 } 463 }
452 if ((next = strchr (cp, ',')) != NULL)
453 *(next++) = '\0';
454 sscanf (cp, "%d", &value);
455 mt->mod[i] = (sint8) value;
456 cp = next;
457 }
458 } 464 }
459 else if (sscanf (cp, "chance %d\n", &value)) 465 break;
466
467 case KW_chance: thawer.get (mt->chance); break;
468 case KW_difficulty: // cf+ alias, not original cf
469 case KW_diff: thawer.get (mt->difficulty); break;
470 case KW_magic: thawer.get (mt->magic); break;
471 case KW_dam: // cf+ alias, not original cf
472 case KW_damage: thawer.get (mt->damage); break;
473 case KW_wc: thawer.get (mt->wc); break;
474 case KW_ac: thawer.get (mt->ac); break;
475 case KW_sp: thawer.get (mt->sp); break;
476 case KW_weight: thawer.get (mt->weight); break;
477 case KW_value: thawer.get (mt->value); break;
478 case KW_density: thawer.get (mt->density); break;
479
480 case KW_EOF:
481 goto done;
482
483 default:
484 if (!thawer.parse_error ("materials file", "materials"))
485 goto done;
486 break;
460 { 487 }
461 mt->chance = (sint8) value;
462 }
463 else if (sscanf (cp, "diff %d\n", &value))
464 {
465 mt->difficulty = (sint8) value;
466 }
467 else if (sscanf (cp, "magic %d\n", &value))
468 {
469 mt->magic = (sint8) value;
470 }
471 else if (sscanf (cp, "damage %d\n", &value))
472 {
473 mt->damage = (sint8) value;
474 }
475 else if (sscanf (cp, "wc %d\n", &value))
476 {
477 mt->wc = (sint8) value;
478 }
479 else if (sscanf (cp, "ac %d\n", &value))
480 {
481 mt->ac = (sint8) value;
482 }
483 else if (sscanf (cp, "sp %d\n", &value))
484 {
485 mt->sp = (sint8) value;
486 }
487 else if (sscanf (cp, "weight %d\n", &value))
488 {
489 mt->weight = value;
490 }
491 else if (sscanf (cp, "value %d\n", &value))
492 {
493 mt->value = value;
494 }
495 } 488 }
489
490done:
496 if (mt->next) 491 if (mt->next)
497 { 492 {
498 delete mt->next; 493 delete mt->next;
499 494
500 mt->next = NULL; 495 mt->next = 0;
501 } 496 }
497
502 LOG (llevDebug, "Done.\n"); 498 LOG (llevDebug, "Done.\n");
503 fclose (fp);
504} 499}
505 500
506/* This loads the settings file. There could be debate whether this should 501/* This loads the settings file. There could be debate whether this should
507 * be here or in the common directory - but since only the server needs this 502 * be here or in the common directory - but since only the server needs this
508 * information, having it here probably makes more sense. 503 * information, having it here probably makes more sense.
… …
518 513
519 /* We don't require a settings file at current time, but down the road, 514 /* We don't require a settings file at current time, but down the road,
520 * there will probably be so many values that not having a settings file 515 * there will probably be so many values that not having a settings file
521 * will not be a good thing. 516 * will not be a good thing.
522 */ 517 */
523 if ((fp = open_and_uncompress (buf, 0, &comp)) == NULL) 518 if (!(fp = open_and_uncompress (buf, 0, &comp)))
524 { 519 {
525 LOG (llevError, "Warning: No settings file found\n"); 520 LOG (llevError, "Error: No settings file found\n");
526 return; 521 exit (1);
527 } 522 }
523
528 while (fgets (buf, MAX_BUF - 1, fp) != NULL) 524 while (fgets (buf, MAX_BUF - 1, fp) != NULL)
529 { 525 {
530 if (buf[0] == '#') 526 if (buf[0] == '#')
531 continue; 527 continue;
532 /* eliminate newline */ 528 /* eliminate newline */
… …
546 *cp++ = 0; 542 *cp++ = 0;
547 has_val = 1; 543 has_val = 1;
548 } 544 }
549 else 545 else
550 { 546 {
551 cp = ""; 547 cp = (char *)"";
552 has_val = 0; 548 has_val = 0;
553 } 549 }
554 550
555 if (!strcasecmp (buf, "motd")) 551 if (!strcasecmp (buf, "motd"))
556 { 552 {
… …
726 else 722 else
727 { 723 {
728 LOG (llevError, "load_settings: Unknown value for " "spell_failure_effects: %s\n", cp); 724 LOG (llevError, "load_settings: Unknown value for " "spell_failure_effects: %s\n", cp);
729 } 725 }
730 } 726 }
731 else if (!strcasecmp (buf, "casting_time"))
732 {
733 if (!strcasecmp (cp, "on") || !strcasecmp (cp, "true"))
734 {
735 settings.casting_time = TRUE;
736 }
737 else if (!strcasecmp (cp, "off") || !strcasecmp (cp, "false"))
738 {
739 settings.casting_time = FALSE;
740 }
741 else
742 {
743 LOG (llevError, "load_settings: Unknown value for " "casting_time: %s\n", cp);
744 }
745 }
746 else if (!strcasecmp (buf, "real_wiz"))
747 {
748 if (!strcasecmp (cp, "on") || !strcasecmp (cp, "true"))
749 {
750 settings.real_wiz = TRUE;
751 }
752 else if (!strcasecmp (cp, "off") || !strcasecmp (cp, "false"))
753 {
754 settings.real_wiz = FALSE;
755 }
756 else
757 {
758 LOG (llevError, "load_settings: Unknown value for " "real_wiz: %s\n", cp);
759 }
760 }
761 else if (!strcasecmp (buf, "spellpoint_level_depend")) 727 else if (!strcasecmp (buf, "spellpoint_level_depend"))
762 { 728 {
763 if (!strcasecmp (cp, "on") || !strcasecmp (cp, "true")) 729 if (!strcasecmp (cp, "on") || !strcasecmp (cp, "true"))
764 { 730 {
765 settings.spellpoint_level_depend = TRUE; 731 settings.spellpoint_level_depend = TRUE;
… …
869 } 835 }
870 else if (!strcasecmp (buf, "set_friendly_fire")) 836 else if (!strcasecmp (buf, "set_friendly_fire"))
871 { 837 {
872 int val = atoi (cp); 838 int val = atoi (cp);
873 839
874#if COZY_SERVER
875 if (val < 0 || val > 100) 840 if (val < 0 || val > 100)
876 LOG (llevError, "load_settings: set_friendly_fire must be between 0 an 100" ", %d is invalid\n", val); 841 LOG (llevError, "load_settings: set_friendly_fire must be between 0 an 100" ", %d is invalid\n", val);
877#else
878 if (val < 1 || val > 100)
879 LOG (llevError, "load_settings: set_friendly_fire must be between 1 an 100" ", %d is invalid\n", val);
880#endif
881 else 842 else
882 settings.set_friendly_fire = val; 843 settings.set_friendly_fire = val;
883 } 844 }
884 else if (!strcasecmp (buf, "armor_max_enchant")) 845 else if (!strcasecmp (buf, "armor_max_enchant"))
885 { 846 {
… …
938 { 899 {
939 LOG (llevError, "load_settings: unknown value for armor_speed_linear: %s\n", cp); 900 LOG (llevError, "load_settings: unknown value for armor_speed_linear: %s\n", cp);
940 } 901 }
941 902
942 } 903 }
943 else if (!strcasecmp (buf, "no_player_stealing"))
944 {
945 if (!strcasecmp (cp, "on") || !strcasecmp (cp, "true"))
946 {
947 settings.no_player_stealing = TRUE;
948 }
949 else if (!strcasecmp (cp, "off") || !strcasecmp (cp, "false"))
950 {
951 settings.no_player_stealing = FALSE;
952 }
953 else
954 {
955 LOG (llevError, "load_settings: unknown value for no_player_stealing: %s\n", cp);
956 }
957
958 }
959 else if (!strcasecmp (buf, "create_home_portals"))
960 {
961 if (!strcasecmp (cp, "on") || !strcasecmp (cp, "true"))
962 {
963 settings.create_home_portals = TRUE;
964 }
965 else if (!strcasecmp (cp, "off") || !strcasecmp (cp, "false"))
966 {
967 settings.create_home_portals = FALSE;
968 }
969 else
970 {
971 LOG (llevError, "load_settings: Unknown value for create_home_portals: %s\n", cp);
972 }
973
974 }
975 else 904 else
976 {
977 LOG (llevError, "Unknown value in settings file: %s\n", buf); 905 LOG (llevError, "Unknown value in settings file: %s\n", buf);
978 }
979 } 906 }
980 907
981 close_and_delete (fp, comp); 908 close_and_delete (fp, comp);
982} 909}
983 910
984/* 911/*
985 * init() is called only once, when starting the program. 912 * init() is called only once, when starting the program.
986 */ 913 */
987
988void 914void
989init (int argc, char **argv) 915init (int argc, char **argv)
990{ 916{
991 init_done = 0; /* Must be done before init_signal() */ 917 init_done = 0; /* Must be done before init_signal() */
992 rndm.seed (time (0)); 918 rndm.seed (time (0));
993 919
994 logfile = stderr; 920 logfile = stderr;
921 init_environ ();
995 parse_args (argc, argv, 1); /* First arg pass - right now it does 922 parse_args (argc, argv, 1); /* First arg pass - right now it does
996 * nothing, but in future specifying the 923 * nothing, but in future specifying the
997 * LibDir in this pass would be reasonable*/ 924 * LibDir in this pass would be reasonable*/
998 925
926 init_anim (); // Must be called before perl
927 init_globals ();
928 init_experience ();
929 init_attackmess ();
930 init_dynamic ();
931 init_block ();
999 cfperl_init (); 932 cfperl_init ();
1000 init_library (); /* Must be called early */
1001 load_settings (); /* Load the settings file */ 933 load_settings (); /* Load the settings file */
1002 load_materials (); 934 load_materials ();
1003 parse_args (argc, argv, 2); 935 parse_args (argc, argv, 2);
1004 fprintf (logfile, "Welcome to CrossFire, v%s\n", VERSION); 936 fprintf (logfile, "Welcome to Deliantra, v%s\n", VERSION);
1005 fprintf (logfile, "Copyright (C) 2005, 2006, 2007 Marc Lehmann.\n"); 937 fprintf (logfile, "Copyright (C) 2005, 2006, 2007 Marc Lehmann.\n");
1006 fprintf (logfile, "Copyright (C) 1994 Mark Wedel.\n"); 938 fprintf (logfile, "Copyright (C) 1994 Mark Wedel.\n");
1007 fprintf (logfile, "Copyright (C) 1992 Frank Tore Johansen.\n"); 939 fprintf (logfile, "Copyright (C) 1992 Frank Tore Johansen.\n");
1008 940
1009 if (strcmp (settings.dm_mail, "") != 0) 941 if (strcmp (settings.dm_mail, "") != 0)
1010 { 942 {
1011 fprintf (logfile, "Maintained locally by: %s\n", settings.dm_mail); 943 fprintf (logfile, "Maintained locally by: %s\n", settings.dm_mail);
1012 fprintf (logfile, "Questions and bugs should be mailed to above address.\n"); 944 fprintf (logfile, "Questions and bugs should be mailed to above address.\n");
1013 } 945 }
1014 946
1015 init_startup (); /* Write (C), check shutdown/forbid files */ 947 UUID::init ();
1016 init_uuid ();
1017 init_signals (); /* Sets up signal interceptions */ 948 init_signals (); /* Sets up signal interceptions */
1018 init_commands (); /* Sort command tables */ 949 init_commands (); /* Sort command tables */
1019 init_skills (); 950 init_skills ();
1020 951
1021 parse_args (argc, argv, 3); 952 parse_args (argc, argv, 3);
1022 953
1023 if (settings.daemonmode)
1024 logfile = BecomeDaemon (settings.logfilename[0] == '\0' ? "logfile" : settings.logfilename);
1025
1026 init_beforeplay (); 954 init_beforeplay ();
1027 init_ericserver ();
1028 init_done = 1; 955 init_done = 1;
1029} 956}
1030 957
1031void 958void
1032usage (void) 959usage (void)
1033{ 960{
1034 (void) fprintf (logfile, "Usage: crossfire [-h] [-<flags>]...\n"); 961 (void) fprintf (logfile, "Usage: deliantra-server [-h] [-<flags>]...\n");
1035} 962}
1036 963
1037void 964void
1038help (void) 965help (void)
1039{ 966{
… …
1080} 1007}
1081 1008
1082void 1009void
1083init_beforeplay (void) 1010init_beforeplay (void)
1084{ 1011{
1085 init_archetypes (); /* If not called before, reads all archetypes from file */
1086 init_artifacts (); /* If not called before, reads all artifacts from file */ 1012 init_artifacts (); /* If not called before, reads all artifacts from file */
1087 init_spells (); /* If not called before, links archtypes used by spells */ 1013 init_spells (); /* If not called before, links archtypes used by spells */
1088 init_regions (); /* If not called before, reads all regions from file */
1089 init_archetype_pointers (); /* Setup global pointers to archetypes */ 1014 init_archetype_pointers (); /* Setup global pointers to archetypes */
1090 init_races (); /* overwrite race designations using entries in lib/races file */ 1015 init_races (); /* overwrite race designations using entries in lib/races file */
1091 init_gods (); /* init linked list of gods from archs */ 1016 init_gods (); /* init linked list of gods from archs */
1092 init_readable (); /* inits useful arrays for readable texts */ 1017 init_readable (); /* inits useful arrays for readable texts */
1093 init_formulae (); /* If not called before, reads formulae from file */ 1018 init_formulae (); /* If not called before, reads formulae from file */
1094
1095 switch (settings.dumpvalues)
1096 {
1097 case 1:
1098 print_monsters ();
1099 exit (0);
1100 case 2:
1101 dump_abilities ();
1102 exit (0);
1103 case 3:
1104 dump_artifacts ();
1105 exit (0);
1106 case 4:
1107 dump_spells ();
1108 exit (0);
1109 case 5:
1110 exit (0);
1111 case 6:
1112 dump_races ();
1113 exit (0);
1114 case 7:
1115 dump_alchemy ();
1116 exit (0);
1117 case 9:
1118 dump_alchemy_costs ();
1119 exit (0);
1120 case 10:
1121 dump_monster_treasure (settings.dumparg);
1122 exit (0);
1123 }
1124}
1125
1126void
1127init_startup (void)
1128{
1129 char buf[MAX_BUF];
1130 FILE *fp;
1131 int comp;
1132
1133#ifdef SHUTDOWN_FILE
1134 sprintf (buf, "%s/%s", settings.confdir, SHUTDOWN_FILE);
1135 if ((fp = open_and_uncompress (buf, 0, &comp)) != NULL)
1136 {
1137 while (fgets (buf, MAX_BUF - 1, fp) != NULL)
1138 printf ("%s", buf);
1139 close_and_delete (fp, comp);
1140 exit (1);
1141 }
1142#endif
1143
1144 if (forbid_play ())
1145 { /* Maybe showing highscore should be allowed? */
1146 LOG (llevError, "CrossFire: Playing not allowed.\n");
1147 exit (-1);
1148 }
1149}
1150
1151/*
1152 * compile_info(): activated with the -o flag.
1153 * It writes out information on how Imakefile and config.h was configured
1154 * at compile time.
1155 */
1156
1157void
1158compile_info (void)
1159{
1160 int i = 0;
1161
1162 printf ("Non-standard include files:\n");
1163#if !defined (__STRICT_ANSI__) || defined (__sun__)
1164# if !defined (Mips)
1165 printf ("<stdlib.h>\n");
1166 i = 1;
1167# endif
1168# if !defined (MACH) && !defined (sony)
1169 printf ("<malloc.h>\n");
1170 i = 1;
1171# endif
1172#endif
1173#ifndef __STRICT_ANSI__
1174# ifndef MACH
1175 printf ("<memory.h\n");
1176 i = 1;
1177# endif
1178#endif
1179#ifndef sgi
1180 printf ("<sys/timeb.h>\n");
1181 i = 1;
1182#endif
1183 if (!i)
1184 printf ("(none)\n");
1185 printf ("Datadir:\t\t%s\n", settings.datadir);
1186 printf ("Localdir:\t\t%s\n", settings.localdir);
1187#ifdef PERM_FILE
1188 printf ("Perm file:\t<ETC>/%s\n", PERM_FILE);
1189#endif
1190#ifdef SHUTDOWN_FILE
1191 printf ("Shutdown file:\t<ETC>/%s\n", SHUTDOWN_FILE);
1192#endif
1193 printf ("Save player:\t<true>\n");
1194 printf ("Save mode:\t%4.4o\n", SAVE_MODE);
1195 printf ("Playerdir:\t<VAR>/%s\n", settings.playerdir);
1196 printf ("Itemsdir:\t<VAR>/%s\n", settings.uniquedir);
1197 printf ("Tmpdir:\t\t%s\n", settings.tmpdir);
1198#ifdef USE_CALLOC
1199 printf ("Use_calloc:\t<true>\n");
1200#else
1201 printf ("Use_calloc:\t<false>\n");
1202#endif
1203
1204#ifdef X_EDITOR
1205 printf ("Editor:\t\t%s\n", X_EDITOR);
1206#endif
1207
1208 printf ("Max_time:\t%d\n", MAX_TIME);
1209
1210 execl ("/bin/uname", "uname", "-a", NULL);
1211 LOG (llevError, "Oops, shouldn't have gotten here: execl(/bin/uname) failed: %s\n", strerror (errno));
1212 exit (-1);
1213} 1019}
1214 1020
1215/* Signal handlers: */ 1021/* Signal handlers: */
1216 1022
1217void 1023static void
1218rec_sigabrt (int i) 1024rec_sigabrt (int i)
1219{ 1025{
1220 signal (SIGABRT, SIG_DFL); 1026 signal (SIGABRT, SIG_DFL);
1221 1027
1222 LOG (llevError, "SIGABRT received.\n"); 1028 LOG (llevError, "SIGABRT received.\n");
1223 cleanup ("SIGABRT received", 1); 1029 cleanup ("SIGABRT received", 1);
1224} 1030}
1225 1031
1226void 1032static void
1227rec_sigsegv (int i) 1033rec_sigsegv (int i)
1228{ 1034{
1229 signal (SIGSEGV, SIG_DFL); 1035 signal (SIGSEGV, SIG_DFL);
1230 1036
1231 LOG (llevError, "SIGSEGV received.\n"); 1037 LOG (llevError, "SIGSEGV received.\n");
1232 cleanup ("SIGSEGV received", 1); 1038 cleanup ("SIGSEGV received", 1);
1233} 1039}
1234 1040
1235void 1041static void
1236rec_sigquit (int i) 1042rec_sigquit (int i)
1237{ 1043{
1238 signal (SIGQUIT, SIG_IGN); 1044 signal (SIGQUIT, SIG_IGN);
1239 1045
1240 LOG (llevInfo, "SIGQUIT received\n"); 1046 LOG (llevInfo, "SIGQUIT received\n");
1241 cleanup ("SIGQUIT received", 1); 1047 cleanup ("SIGQUIT received", 1);
1242} 1048}
1243 1049
1244void 1050static void
1245rec_sigbus (int i) 1051rec_sigbus (int i)
1246{ 1052{
1247 signal (SIGBUS, SIG_DFL); 1053 signal (SIGBUS, SIG_DFL);
1248 1054
1249 LOG (llevError, "SIGBUS received\n"); 1055 LOG (llevError, "SIGBUS received\n");
1250 cleanup ("SIGBUS received", 1); 1056 cleanup ("SIGBUS received", 1);
1057}
1058
1059void
1060reset_signals ()
1061{
1062 signal (SIGABRT, SIG_DFL);
1063 signal (SIGQUIT, SIG_DFL);
1064 signal (SIGSEGV, SIG_DFL);
1065 signal (SIGBUS , SIG_DFL);
1066 signal (SIGINT , SIG_DFL);
1067 signal (SIGTERM, SIG_DFL);
1251} 1068}
1252 1069
1253void 1070void
1254init_signals (void) 1071init_signals (void)
1255{ 1072{
… …
1264 sigaltstack (&ss, 0); 1081 sigaltstack (&ss, 0);
1265 1082
1266 struct sigaction sa; 1083 struct sigaction sa;
1267 1084
1268 sigfillset (&sa.sa_mask); 1085 sigfillset (&sa.sa_mask);
1269 sa.sa_flags = SA_ONSTACK | SA_RESTART; 1086 sa.sa_flags = SA_RESTART;
1270 1087
1271 sa.sa_handler = SIG_IGN; sigaction (SIGPIPE, &sa, 0); 1088 sa.sa_handler = SIG_IGN; sigaction (SIGPIPE, &sa, 0);
1272 sa.sa_handler = rec_sigabrt; sigaction (SIGABRT, &sa, 0); 1089 sa.sa_handler = rec_sigabrt; sigaction (SIGABRT, &sa, 0);
1273 sa.sa_handler = rec_sigquit; sigaction (SIGQUIT, &sa, 0); 1090 sa.sa_handler = rec_sigquit; sigaction (SIGQUIT, &sa, 0);
1091 sa.sa_handler = rec_sigbus; sigaction (SIGBUS, &sa, 0);
1092
1093 sa.sa_flags |= SA_ONSTACK;
1274 sa.sa_handler = rec_sigsegv; sigaction (SIGSEGV, &sa, 0); 1094 sa.sa_handler = rec_sigsegv; sigaction (SIGSEGV, &sa, 0);
1275 sa.sa_handler = rec_sigbus; sigaction (SIGBUS, &sa, 0);
1276} 1095}
1277 1096
1278/* init_races() - reads the races file in the lib/ directory, then 1097/* init_races() - reads the races file in the lib/ directory, then
1279 * overwrites old 'race' entries. This routine allow us to quickly 1098 * overwrites old 'race' entries. This routine allow us to quickly
1280 * re-configure the 'alignment' of monsters, objects. Useful for 1099 * re-configure the 'alignment' of monsters, objects. Useful for
… …
1320 set_list = 0; 1139 set_list = 0;
1321 cp++; 1140 cp++;
1322 } 1141 }
1323 1142
1324 if (sscanf (cp, "RACE %s", variable)) 1143 if (sscanf (cp, "RACE %s", variable))
1325 { /* set new race value */ 1144 /* set new race value */
1326 strcpy (race, variable); 1145 strcpy (race, variable);
1327 }
1328 else 1146 else
1329 { 1147 {
1330 char *cp1; 1148 char *cp1;
1331 1149
1332 /* Take out beginning spaces */ 1150 /* Take out beginning spaces */
… …
1346 /* set creature race to race value */ 1164 /* set creature race to race value */
1347 if ((mon = archetype::find (cp)) == NULL) 1165 if ((mon = archetype::find (cp)) == NULL)
1348 LOG (llevError, "Creature %s in race file lacks archetype\n", cp); 1166 LOG (llevError, "Creature %s in race file lacks archetype\n", cp);
1349 else 1167 else
1350 { 1168 {
1351 if (set_race && (!mon->clone.race || strcmp (mon->clone.race, race))) 1169 if (set_race && (!mon->race || strcmp (mon->race, race)))
1352 { 1170 {
1353 if (mon->clone.race) 1171 if (mon->race)
1354 LOG (llevDebug, "Resetting race to %s from %s for archetype %s\n", race, &mon->clone.race, &mon->name); 1172 LOG (llevDebug, "Resetting race to %s from %s for archetype %s\n", race, &mon->race, &mon->archname);
1355 1173
1356 mon->clone.race = race; 1174 mon->race = race;
1357 } 1175 }
1358 1176
1359 /* if the arch is a monster, add it to the race list */ 1177 /* if the arch is a monster, add it to the race list */
1360 if (set_list && QUERY_FLAG (&mon->clone, FLAG_MONSTER)) 1178 if (set_list && QUERY_FLAG (mon, FLAG_MONSTER))
1361 add_to_racelist (race, &mon->clone); 1179 add_to_racelist (race, mon);
1362 } 1180 }
1363 } 1181 }
1364 } 1182 }
1365 1183
1366 fclose (file); 1184 fclose (file);
… …
1375 1193
1376 for (list = first_race; list; list = list->next) 1194 for (list = first_race; list; list = list->next)
1377 { 1195 {
1378 fprintf (stderr, "\nRACE %s:\t", &list->name); 1196 fprintf (stderr, "\nRACE %s:\t", &list->name);
1379 for (tmp = list->member; tmp; tmp = tmp->next) 1197 for (tmp = list->member; tmp; tmp = tmp->next)
1380 fprintf (stderr, "%s(%d), ", &tmp->ob->arch->name, tmp->ob->level); 1198 fprintf (stderr, "%s(%d), ", &tmp->ob->arch->archname, tmp->ob->level);
1381 } 1199 }
1382 1200
1383 fprintf (stderr, "\n"); 1201 fprintf (stderr, "\n");
1384} 1202}
1385 1203

Diff Legend

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