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.26 by pippijn, Wed Jan 3 00:21:36 2007 UTC vs.
Revision 1.56 by root, Sun Jul 1 05:00:20 2007 UTC

1/* 1/*
2 CrossFire, A Multiplayer game for X-windows 2 * This file is part of Crossfire TRT, the Roguelike Realtime MORPG.
3 3 *
4 * Copyright (©) 2005,2006,2007 Marc Alexander Lehmann / Robin Redeker / the Crossfire TRT team
4 Copyright (C) 2002 Mark Wedel & Crossfire Development Team 5 * Copyright (©) 2002,2007 Mark Wedel & Crossfire Development Team
5 Copyright (C) 1992 Frank Tore Johansen 6 * Copyright (©) 1992,2007 Frank Tore Johansen
6 7 *
7 This program is free software; you can redistribute it and/or modify 8 * Crossfire TRT is free software: you can redistribute it and/or modify
8 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
9 the Free Software Foundation; either version 2 of the License, or 10 * the Free Software Foundation, either version 3 of the License, or
10 (at your option) any later version. 11 * (at your option) any later version.
11 12 *
12 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,
13 but WITHOUT ANY WARRANTY; without even the implied warranty of 14 * but WITHOUT ANY WARRANTY; without even the implied warranty of
14 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the 15 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
15 GNU General Public License for more details. 16 * GNU General Public License for more details.
16 17 *
17 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
18 along with this program; if not, write to the Free Software 19 * along with this program. If not, see <http://www.gnu.org/licenses/>.
19 Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. 20 *
20
21 The authors can be reached via e-mail at <crossfire@schmorp.de> 21 * The authors can be reached via e-mail to <crossfire@schmorp.de>
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#include <sproto.h> 27#include <sproto.h>
… …
373} 373}
374 374
375static void 375static void
376load_materials (void) 376load_materials (void)
377{ 377{
378 char buf[MAX_BUF], filename[MAX_BUF], *cp, *next; 378 char filename[MAX_BUF];
379 FILE *fp;
380 materialtype_t *mt; 379 materialtype_t *mt;
381 int i, value;
382 380
383 sprintf (filename, "%s/materials", settings.datadir); 381 sprintf (filename, "%s/materials", settings.datadir);
384 LOG (llevDebug, "Reading material type data from %s...\n", filename); 382 LOG (llevDebug, "Reading material type data from %s...\n", filename);
385 if ((fp = fopen (filename, "r")) == NULL) 383
384 object_thawer thawer (filename);
385
386 if (!thawer)
386 { 387 {
387 LOG (llevError, "Cannot open %s for reading\n", filename); 388 LOG (llevError, "Cannot open %s for reading\n", filename);
388 mt = get_empty_mat (); 389 mt = get_empty_mat ();
389 mt->next = NULL; 390 mt->next = 0;
390 materialt = mt; 391 materialt = mt;
391 return; 392 return;
392 } 393 }
394
393 mt = get_empty_mat (); 395 mt = get_empty_mat ();
394 materialt = mt; 396 materialt = mt;
395 while (fgets (buf, MAX_BUF, fp) != NULL) 397
398 for (;;)
396 { 399 {
397 if (*buf == '#') 400 thawer.next ();
398 continue; 401
399 if ((cp = strchr (buf, '\n')) != NULL) 402 switch (thawer.kw)
400 *cp = '\0';
401 cp = buf;
402 while (*cp == ' ') /* Skip blanks */
403 cp++;
404 if (!strncmp (cp, "name", 4))
405 { 403 {
404 case KW_name:
406 /* clean up the previous entry */ 405 /* clean up the previous entry */
407 if (mt->next != NULL) 406 if (mt->next)
408 { 407 {
409 if (mt->description == NULL) 408 if (!mt->description)
410 mt->description = mt->name; 409 mt->description = mt->name;
410
411 mt = mt->next; 411 mt = mt->next;
412 } 412 }
413
413 mt->next = get_empty_mat (); 414 mt->next = get_empty_mat ();
414 mt->name = strchr (cp, ' ') + 1; 415 thawer.get (mt->name);
415 } 416 break;
416 else if (!strncmp (cp, "description", 11)) 417
418 case KW_description:
419 thawer.get (mt->description);
420 break;
421
422 case KW_material:
423 thawer.get (mt->material);
424 break;
425
426 case KW_saves:
417 { 427 {
418 mt->description = strchr (cp, ' ') + 1; 428 const char *cp = thawer.get_str () - 1;
419 } 429
420 else if (sscanf (cp, "material %d", &value))
421 {
422 mt->material = value;
423 }
424 else if (!strncmp (cp, "saves", 5))
425 {
426 cp = strchr (cp, ' ') + 1;
427 for (i = 0; i < NROFATTACKS; i++) 430 for (int i = 0; i < NROFATTACKS; i++)
428 {
429 if (cp == NULL)
430 { 431 {
432 if (!cp)
433 {
431 mt->save[i] = 0; 434 mt->save[i] = 0;
432 continue; 435 continue;
436 }
437
438 int value;
439 ++cp;
440 sscanf (cp, "%d", &value);
441 mt->save[i] = (sint8) value;
442 cp = strchr (cp, ',');
433 } 443 }
434 if ((next = strchr (cp, ',')) != NULL)
435 *(next++) = '\0';
436 sscanf (cp, "%d", &value);
437 mt->save[i] = (sint8) value;
438 cp = next;
439 }
440 }
441 else if (!strncmp (cp, "mods", 4))
442 {
443 cp = strchr (cp, ' ') + 1;
444 for (i = 0; i < NROFATTACKS; i++)
445 { 444 }
446 if (cp == NULL) 445 break;
446
447 case KW_mods:
448 {
449 const char *cp = thawer.get_str () - 1;
450
451 for (int i = 0; i < NROFATTACKS; i++)
447 { 452 {
453 if (!cp)
454 {
448 mt->save[i] = 0; 455 mt->save[i] = 0;
449 continue; 456 continue;
457 }
458
459 ++cp;
460 int value;
461 sscanf (cp, "%d", &value);
462 mt->mod[i] = (sint8) value;
463 cp = strchr (cp, ',');
450 } 464 }
451 if ((next = strchr (cp, ',')) != NULL)
452 *(next++) = '\0';
453 sscanf (cp, "%d", &value);
454 mt->mod[i] = (sint8) value;
455 cp = next;
456 }
457 } 465 }
458 else if (sscanf (cp, "chance %d\n", &value)) 466 break;
467
468 case KW_chance: thawer.get (mt->chance); break;
469 case KW_difficulty: // cf+ alias, not original cf
470 case KW_diff: thawer.get (mt->difficulty); break;
471 case KW_magic: thawer.get (mt->magic); break;
472 case KW_dam: // cf+ alias, not original cf
473 case KW_damage: thawer.get (mt->damage); break;
474 case KW_wc: thawer.get (mt->wc); break;
475 case KW_ac: thawer.get (mt->ac); break;
476 case KW_sp: thawer.get (mt->sp); break;
477 case KW_weight: thawer.get (mt->weight); break;
478 case KW_value: thawer.get (mt->value); break;
479 case KW_density: thawer.get (mt->density); break;
480
481 case KW_EOF:
482 goto done;
483
484 default:
485 if (!thawer.parse_error ("materials file", "materials"))
486 goto done;
487 break;
459 { 488 }
460 mt->chance = (sint8) value;
461 }
462 else if (sscanf (cp, "diff %d\n", &value))
463 {
464 mt->difficulty = (sint8) value;
465 }
466 else if (sscanf (cp, "magic %d\n", &value))
467 {
468 mt->magic = (sint8) value;
469 }
470 else if (sscanf (cp, "damage %d\n", &value))
471 {
472 mt->damage = (sint8) value;
473 }
474 else if (sscanf (cp, "wc %d\n", &value))
475 {
476 mt->wc = (sint8) value;
477 }
478 else if (sscanf (cp, "ac %d\n", &value))
479 {
480 mt->ac = (sint8) value;
481 }
482 else if (sscanf (cp, "sp %d\n", &value))
483 {
484 mt->sp = (sint8) value;
485 }
486 else if (sscanf (cp, "weight %d\n", &value))
487 {
488 mt->weight = value;
489 }
490 else if (sscanf (cp, "value %d\n", &value))
491 {
492 mt->value = value;
493 }
494 } 489 }
490
491done:
495 if (mt->next) 492 if (mt->next)
496 { 493 {
497 delete mt->next; 494 delete mt->next;
498 495
499 mt->next = NULL; 496 mt->next = 0;
500 } 497 }
498
501 LOG (llevDebug, "Done.\n"); 499 LOG (llevDebug, "Done.\n");
502 fclose (fp);
503} 500}
504 501
505/* This loads the settings file. There could be debate whether this should 502/* This loads the settings file. There could be debate whether this should
506 * be here or in the common directory - but since only the server needs this 503 * be here or in the common directory - but since only the server needs this
507 * information, having it here probably makes more sense. 504 * information, having it here probably makes more sense.
… …
517 514
518 /* We don't require a settings file at current time, but down the road, 515 /* We don't require a settings file at current time, but down the road,
519 * there will probably be so many values that not having a settings file 516 * there will probably be so many values that not having a settings file
520 * will not be a good thing. 517 * will not be a good thing.
521 */ 518 */
522 if ((fp = open_and_uncompress (buf, 0, &comp)) == NULL) 519 if (!(fp = open_and_uncompress (buf, 0, &comp)))
523 { 520 {
524 LOG (llevError, "Warning: No settings file found\n"); 521 LOG (llevError, "Error: No settings file found\n");
525 return; 522 exit (1);
526 } 523 }
524
527 while (fgets (buf, MAX_BUF - 1, fp) != NULL) 525 while (fgets (buf, MAX_BUF - 1, fp) != NULL)
528 { 526 {
529 if (buf[0] == '#') 527 if (buf[0] == '#')
530 continue; 528 continue;
531 /* eliminate newline */ 529 /* eliminate newline */
… …
545 *cp++ = 0; 543 *cp++ = 0;
546 has_val = 1; 544 has_val = 1;
547 } 545 }
548 else 546 else
549 { 547 {
550 cp = ""; 548 cp = (char *)"";
551 has_val = 0; 549 has_val = 0;
552 } 550 }
553 551
554 if (!strcasecmp (buf, "motd")) 552 if (!strcasecmp (buf, "motd"))
555 { 553 {
… …
725 else 723 else
726 { 724 {
727 LOG (llevError, "load_settings: Unknown value for " "spell_failure_effects: %s\n", cp); 725 LOG (llevError, "load_settings: Unknown value for " "spell_failure_effects: %s\n", cp);
728 } 726 }
729 } 727 }
730 else if (!strcasecmp (buf, "casting_time"))
731 {
732 if (!strcasecmp (cp, "on") || !strcasecmp (cp, "true"))
733 {
734 settings.casting_time = TRUE;
735 }
736 else if (!strcasecmp (cp, "off") || !strcasecmp (cp, "false"))
737 {
738 settings.casting_time = FALSE;
739 }
740 else
741 {
742 LOG (llevError, "load_settings: Unknown value for " "casting_time: %s\n", cp);
743 }
744 }
745 else if (!strcasecmp (buf, "real_wiz"))
746 {
747 if (!strcasecmp (cp, "on") || !strcasecmp (cp, "true"))
748 {
749 settings.real_wiz = TRUE;
750 }
751 else if (!strcasecmp (cp, "off") || !strcasecmp (cp, "false"))
752 {
753 settings.real_wiz = FALSE;
754 }
755 else
756 {
757 LOG (llevError, "load_settings: Unknown value for " "real_wiz: %s\n", cp);
758 }
759 }
760 else if (!strcasecmp (buf, "explore_mode"))
761 {
762 if (!strcasecmp (cp, "on") || !strcasecmp (cp, "true"))
763 {
764 settings.explore_mode = TRUE;
765 }
766 else if (!strcasecmp (cp, "off") || !strcasecmp (cp, "false"))
767 {
768 settings.explore_mode = FALSE;
769 }
770 else
771 {
772 LOG (llevError, "load_settings: Unknown value for " "explore_mode: %s\n", cp);
773 }
774 }
775 else if (!strcasecmp (buf, "spellpoint_level_depend")) 728 else if (!strcasecmp (buf, "spellpoint_level_depend"))
776 { 729 {
777 if (!strcasecmp (cp, "on") || !strcasecmp (cp, "true")) 730 if (!strcasecmp (cp, "on") || !strcasecmp (cp, "true"))
778 { 731 {
779 settings.spellpoint_level_depend = TRUE; 732 settings.spellpoint_level_depend = TRUE;
… …
883 } 836 }
884 else if (!strcasecmp (buf, "set_friendly_fire")) 837 else if (!strcasecmp (buf, "set_friendly_fire"))
885 { 838 {
886 int val = atoi (cp); 839 int val = atoi (cp);
887 840
888#if COZY_SERVER
889 if (val < 0 || val > 100) 841 if (val < 0 || val > 100)
890 LOG (llevError, "load_settings: set_friendly_fire must be between 0 an 100" ", %d is invalid\n", val); 842 LOG (llevError, "load_settings: set_friendly_fire must be between 0 an 100" ", %d is invalid\n", val);
891#else
892 if (val < 1 || val > 100)
893 LOG (llevError, "load_settings: set_friendly_fire must be between 1 an 100" ", %d is invalid\n", val);
894#endif
895 else 843 else
896 settings.set_friendly_fire = val; 844 settings.set_friendly_fire = val;
897 } 845 }
898 else if (!strcasecmp (buf, "armor_max_enchant")) 846 else if (!strcasecmp (buf, "armor_max_enchant"))
899 { 847 {
… …
952 { 900 {
953 LOG (llevError, "load_settings: unknown value for armor_speed_linear: %s\n", cp); 901 LOG (llevError, "load_settings: unknown value for armor_speed_linear: %s\n", cp);
954 } 902 }
955 903
956 } 904 }
957 else if (!strcasecmp (buf, "no_player_stealing"))
958 {
959 if (!strcasecmp (cp, "on") || !strcasecmp (cp, "true"))
960 {
961 settings.no_player_stealing = TRUE;
962 }
963 else if (!strcasecmp (cp, "off") || !strcasecmp (cp, "false"))
964 {
965 settings.no_player_stealing = FALSE;
966 }
967 else
968 {
969 LOG (llevError, "load_settings: unknown value for no_player_stealing: %s\n", cp);
970 }
971
972 }
973 else if (!strcasecmp (buf, "create_home_portals"))
974 {
975 if (!strcasecmp (cp, "on") || !strcasecmp (cp, "true"))
976 {
977 settings.create_home_portals = TRUE;
978 }
979 else if (!strcasecmp (cp, "off") || !strcasecmp (cp, "false"))
980 {
981 settings.create_home_portals = FALSE;
982 }
983 else
984 {
985 LOG (llevError, "load_settings: Unknown value for create_home_portals: %s\n", cp);
986 }
987
988 }
989 else 905 else
990 {
991 LOG (llevError, "Unknown value in settings file: %s\n", buf); 906 LOG (llevError, "Unknown value in settings file: %s\n", buf);
992 }
993 } 907 }
994 908
995 close_and_delete (fp, comp); 909 close_and_delete (fp, comp);
996} 910}
997
998 911
999/* 912/*
1000 * init() is called only once, when starting the program. 913 * init() is called only once, when starting the program.
1001 */ 914 */
1002
1003void 915void
1004init (int argc, char **argv) 916init (int argc, char **argv)
1005{ 917{
1006 init_done = 0; /* Must be done before init_signal() */ 918 init_done = 0; /* Must be done before init_signal() */
919 rndm.seed (time (0));
920
1007 logfile = stderr; 921 logfile = stderr;
922 init_environ ();
1008 parse_args (argc, argv, 1); /* First arg pass - right now it does 923 parse_args (argc, argv, 1); /* First arg pass - right now it does
1009 * nothing, but in future specifying the 924 * nothing, but in future specifying the
1010 * LibDir in this pass would be reasonable*/ 925 * LibDir in this pass would be reasonable*/
1011 926
927 init_anim (); // Must be called before perl
1012 cfperl_init (); 928 cfperl_init ();
1013 init_library (); /* Must be called early */ 929 init_library (); /* Must be called early */
1014 load_settings (); /* Load the settings file */ 930 load_settings (); /* Load the settings file */
1015 load_materials (); 931 load_materials ();
1016 parse_args (argc, argv, 2); 932 parse_args (argc, argv, 2);
1017 fprintf (logfile, "Welcome to CrossFire, v%s\n", VERSION); 933 fprintf (logfile, "Welcome to CrossFire, v%s\n", VERSION);
934 fprintf (logfile, "Copyright (C) 2005, 2006, 2007 Marc Lehmann.\n");
1018 fprintf (logfile, "Copyright (C) 1994 Mark Wedel.\n"); 935 fprintf (logfile, "Copyright (C) 1994 Mark Wedel.\n");
1019 fprintf (logfile, "Copyright (C) 1992 Frank Tore Johansen.\n"); 936 fprintf (logfile, "Copyright (C) 1992 Frank Tore Johansen.\n");
1020 937
1021 if (strcmp (settings.dm_mail, "") != 0) 938 if (strcmp (settings.dm_mail, "") != 0)
1022 { 939 {
1023 fprintf (logfile, "Maintained locally by: %s\n", settings.dm_mail); 940 fprintf (logfile, "Maintained locally by: %s\n", settings.dm_mail);
1024 fprintf (logfile, "Questions and bugs should be mailed to above address.\n"); 941 fprintf (logfile, "Questions and bugs should be mailed to above address.\n");
1025 } 942 }
1026
1027 SRANDOM (time (NULL));
1028 943
1029 init_startup (); /* Write (C), check shutdown/forbid files */ 944 init_startup (); /* Write (C), check shutdown/forbid files */
1030 init_uuid (); 945 init_uuid ();
1031 init_signals (); /* Sets up signal interceptions */ 946 init_signals (); /* Sets up signal interceptions */
1032 init_commands (); /* Sort command tables */ 947 init_commands (); /* Sort command tables */
1033 init_skills (); 948 init_skills ();
1034 949
1035 parse_args (argc, argv, 3); 950 parse_args (argc, argv, 3);
1036 951
1037 if (settings.daemonmode)
1038 logfile = BecomeDaemon (settings.logfilename[0] == '\0' ? "logfile" : settings.logfilename);
1039
1040 init_beforeplay (); 952 init_beforeplay ();
1041 init_ericserver ();
1042 init_done = 1; 953 init_done = 1;
1043} 954}
1044 955
1045void 956void
1046usage (void) 957usage (void)
… …
1094} 1005}
1095 1006
1096void 1007void
1097init_beforeplay (void) 1008init_beforeplay (void)
1098{ 1009{
1099 init_archetypes (); /* If not called before, reads all archetypes from file */
1100 init_artifacts (); /* If not called before, reads all artifacts from file */ 1010 init_artifacts (); /* If not called before, reads all artifacts from file */
1101 init_spells (); /* If not called before, links archtypes used by spells */ 1011 init_spells (); /* If not called before, links archtypes used by spells */
1102 init_regions (); /* If not called before, reads all regions from file */
1103 init_archetype_pointers (); /* Setup global pointers to archetypes */ 1012 init_archetype_pointers (); /* Setup global pointers to archetypes */
1104 init_races (); /* overwrite race designations using entries in lib/races file */ 1013 init_races (); /* overwrite race designations using entries in lib/races file */
1105 init_gods (); /* init linked list of gods from archs */ 1014 init_gods (); /* init linked list of gods from archs */
1106 init_readable (); /* inits useful arrays for readable texts */ 1015 init_readable (); /* inits useful arrays for readable texts */
1107 init_formulae (); /* If not called before, reads formulae from file */ 1016 init_formulae (); /* If not called before, reads formulae from file */
1108
1109 switch (settings.dumpvalues)
1110 {
1111 case 1:
1112 print_monsters ();
1113 exit (0);
1114 case 2:
1115 dump_abilities ();
1116 exit (0);
1117 case 3:
1118 dump_artifacts ();
1119 exit (0);
1120 case 4:
1121 dump_spells ();
1122 exit (0);
1123 case 5:
1124 exit (0);
1125 case 6:
1126 dump_races ();
1127 exit (0);
1128 case 7:
1129 dump_alchemy ();
1130 exit (0);
1131 case 9:
1132 dump_alchemy_costs ();
1133 exit (0);
1134 case 10:
1135 dump_monster_treasure (settings.dumparg);
1136 exit (0);
1137 }
1138} 1017}
1139 1018
1140void 1019void
1141init_startup (void) 1020init_startup (void)
1142{ 1021{
… …
1226 exit (-1); 1105 exit (-1);
1227} 1106}
1228 1107
1229/* Signal handlers: */ 1108/* Signal handlers: */
1230 1109
1231void 1110static void
1111rec_sigabrt (int i)
1112{
1113 signal (SIGABRT, SIG_DFL);
1114
1115 LOG (llevError, "SIGABRT received.\n");
1116 cleanup ("SIGABRT received", 1);
1117}
1118
1119static void
1232rec_sigsegv (int i) 1120rec_sigsegv (int i)
1233{ 1121{
1122 signal (SIGSEGV, SIG_DFL);
1123
1234 LOG (llevError, "SIGSEGV received.\n"); 1124 LOG (llevError, "SIGSEGV received.\n");
1235 fatal_signal (1, 1); 1125 cleanup ("SIGSEGV received", 1);
1236} 1126}
1237 1127
1238void 1128static void
1239rec_sigint (int i)
1240{
1241 LOG (llevInfo, "SIGINT received.\n");
1242 fatal_signal (0, 1);
1243}
1244
1245void
1246rec_sighup (int i)
1247{
1248 LOG (llevInfo, "SIGHUP received\n");
1249
1250 if (init_done)
1251 cleanup (0);
1252
1253 exit (0);
1254}
1255
1256void
1257rec_sigquit (int i) 1129rec_sigquit (int i)
1258{ 1130{
1131 signal (SIGQUIT, SIG_IGN);
1132
1259 LOG (llevInfo, "SIGQUIT received\n"); 1133 LOG (llevInfo, "SIGQUIT received\n");
1260 fatal_signal (1, 1); 1134 cleanup ("SIGQUIT received", 1);
1261} 1135}
1262 1136
1263void 1137static void
1264rec_sigbus (int i) 1138rec_sigbus (int i)
1265{ 1139{
1266#ifdef SIGBUS 1140 signal (SIGBUS, SIG_DFL);
1141
1267 LOG (llevError, "SIGBUS received\n"); 1142 LOG (llevError, "SIGBUS received\n");
1268 fatal_signal (1, 1); 1143 cleanup ("SIGBUS received", 1);
1269#endif
1270} 1144}
1271 1145
1272void 1146void
1273rec_sigterm (int i) 1147reset_signals ()
1274{ 1148{
1275 LOG (llevInfo, "SIGTERM received\n"); 1149 signal (SIGABRT, SIG_DFL);
1276 fatal_signal (0, 1); 1150 signal (SIGQUIT, SIG_DFL);
1277} 1151 signal (SIGSEGV, SIG_DFL);
1278 1152 signal (SIGBUS , SIG_DFL);
1279void 1153 signal (SIGINT , SIG_DFL);
1280fatal_signal (int make_core, int close_sockets) 1154 signal (SIGTERM, SIG_DFL);
1281{
1282 cleanup (make_core);
1283} 1155}
1284 1156
1285void 1157void
1286init_signals (void) 1158init_signals (void)
1287{ 1159{
1288 signal (SIGHUP, rec_sighup); 1160 // large stack, but it's important data we want to save, and it is not usually
1289 signal (SIGINT, rec_sigint); 1161 // being physically allocated anyways
1290 signal (SIGQUIT, rec_sigquit); 1162 const size_t stacksize = 8 * 1024 * 1024 + SIGSTKSZ;
1291 signal (SIGSEGV, rec_sigsegv); 1163
1292 signal (SIGPIPE, SIG_IGN); 1164 stack_t ss;
1293#ifdef SIGBUS 1165 ss.ss_sp = malloc (stacksize);
1294 signal (SIGBUS, rec_sigbus); 1166 ss.ss_flags = 0;
1295#endif 1167 ss.ss_size = stacksize;
1296 signal (SIGTERM, rec_sigterm); 1168 sigaltstack (&ss, 0);
1169
1170 struct sigaction sa;
1171
1172 sigfillset (&sa.sa_mask);
1173 sa.sa_flags = SA_RESTART;
1174
1175 sa.sa_handler = SIG_IGN; sigaction (SIGPIPE, &sa, 0);
1176 sa.sa_handler = rec_sigabrt; sigaction (SIGABRT, &sa, 0);
1177 sa.sa_handler = rec_sigquit; sigaction (SIGQUIT, &sa, 0);
1178 sa.sa_handler = rec_sigbus; sigaction (SIGBUS, &sa, 0);
1179
1180 sa.sa_flags |= SA_ONSTACK;
1181 sa.sa_handler = rec_sigsegv; sigaction (SIGSEGV, &sa, 0);
1297} 1182}
1298 1183
1299/* init_races() - reads the races file in the lib/ directory, then 1184/* init_races() - reads the races file in the lib/ directory, then
1300 * overwrites old 'race' entries. This routine allow us to quickly 1185 * overwrites old 'race' entries. This routine allow us to quickly
1301 * re-configure the 'alignment' of monsters, objects. Useful for 1186 * re-configure the 'alignment' of monsters, objects. Useful for
1302 * putting together lists of creatures, etc that belong to gods. 1187 * putting together lists of creatures, etc that belong to gods.
1303 */ 1188 */
1304
1305void 1189void
1306init_races (void) 1190init_races (void)
1307{ 1191{
1308 FILE *file; 1192 FILE *file;
1309 char race[MAX_BUF], fname[MAX_BUF], buf[MAX_BUF], *cp, variable[MAX_BUF]; 1193 char race[MAX_BUF], fname[MAX_BUF], buf[MAX_BUF], *cp, variable[MAX_BUF];
… …
1342 set_list = 0; 1226 set_list = 0;
1343 cp++; 1227 cp++;
1344 } 1228 }
1345 1229
1346 if (sscanf (cp, "RACE %s", variable)) 1230 if (sscanf (cp, "RACE %s", variable))
1347 { /* set new race value */ 1231 /* set new race value */
1348 strcpy (race, variable); 1232 strcpy (race, variable);
1349 }
1350 else 1233 else
1351 { 1234 {
1352 char *cp1; 1235 char *cp1;
1353 1236
1354 /* Take out beginning spaces */ 1237 /* Take out beginning spaces */
… …
1368 /* set creature race to race value */ 1251 /* set creature race to race value */
1369 if ((mon = archetype::find (cp)) == NULL) 1252 if ((mon = archetype::find (cp)) == NULL)
1370 LOG (llevError, "Creature %s in race file lacks archetype\n", cp); 1253 LOG (llevError, "Creature %s in race file lacks archetype\n", cp);
1371 else 1254 else
1372 { 1255 {
1373 if (set_race && (!mon->clone.race || strcmp (mon->clone.race, race))) 1256 if (set_race && (!mon->race || strcmp (mon->race, race)))
1374 { 1257 {
1375 if (mon->clone.race) 1258 if (mon->race)
1376 LOG (llevDebug, "Resetting race to %s from %s for archetype %s\n", race, &mon->clone.race, &mon->name); 1259 LOG (llevDebug, "Resetting race to %s from %s for archetype %s\n", race, &mon->race, &mon->archname);
1377 1260
1378 mon->clone.race = race; 1261 mon->race = race;
1379 } 1262 }
1380 1263
1381 /* if the arch is a monster, add it to the race list */ 1264 /* if the arch is a monster, add it to the race list */
1382 if (set_list && QUERY_FLAG (&mon->clone, FLAG_MONSTER)) 1265 if (set_list && QUERY_FLAG (mon, FLAG_MONSTER))
1383 add_to_racelist (race, &mon->clone); 1266 add_to_racelist (race, mon);
1384 } 1267 }
1385 } 1268 }
1386 } 1269 }
1387 1270
1388 fclose (file); 1271 fclose (file);
… …
1397 1280
1398 for (list = first_race; list; list = list->next) 1281 for (list = first_race; list; list = list->next)
1399 { 1282 {
1400 fprintf (stderr, "\nRACE %s:\t", &list->name); 1283 fprintf (stderr, "\nRACE %s:\t", &list->name);
1401 for (tmp = list->member; tmp; tmp = tmp->next) 1284 for (tmp = list->member; tmp; tmp = tmp->next)
1402 fprintf (stderr, "%s(%d), ", &tmp->ob->arch->name, tmp->ob->level); 1285 fprintf (stderr, "%s(%d), ", &tmp->ob->arch->archname, tmp->ob->level);
1403 } 1286 }
1404 1287
1405 fprintf (stderr, "\n"); 1288 fprintf (stderr, "\n");
1406} 1289}
1407 1290

Diff Legend

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