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

Diff Legend

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