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.31 by root, Sun Jan 7 02:39:14 2007 UTC vs.
Revision 1.64 by root, Tue Apr 22 23:50:24 2008 UTC

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

Diff Legend

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