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.30 by pippijn, Sat Jan 6 14:42:30 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 (C) 2005, 2006, 2007 Marc Lehmann & Crossfire+ Development Team 4 * Copyright (©) 2005,2006,2007 Marc Alexander Lehmann / Robin Redeker / the Crossfire TRT 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 * Crossfire TRT 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
22 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>
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>
… …
374} 373}
375 374
376static void 375static void
377load_materials (void) 376load_materials (void)
378{ 377{
379 char buf[MAX_BUF], filename[MAX_BUF], *cp, *next; 378 char filename[MAX_BUF];
380 FILE *fp;
381 materialtype_t *mt; 379 materialtype_t *mt;
382 int i, value;
383 380
384 sprintf (filename, "%s/materials", settings.datadir); 381 sprintf (filename, "%s/materials", settings.datadir);
385 LOG (llevDebug, "Reading material type data from %s...\n", filename); 382 LOG (llevDebug, "Reading material type data from %s...\n", filename);
386 if ((fp = fopen (filename, "r")) == NULL) 383
384 object_thawer thawer (filename);
385
386 if (!thawer)
387 { 387 {
388 LOG (llevError, "Cannot open %s for reading\n", filename); 388 LOG (llevError, "Cannot open %s for reading\n", filename);
389 mt = get_empty_mat (); 389 mt = get_empty_mat ();
390 mt->next = NULL; 390 mt->next = 0;
391 materialt = mt; 391 materialt = mt;
392 return; 392 return;
393 } 393 }
394
394 mt = get_empty_mat (); 395 mt = get_empty_mat ();
395 materialt = mt; 396 materialt = mt;
396 while (fgets (buf, MAX_BUF, fp) != NULL) 397
398 for (;;)
397 { 399 {
398 if (*buf == '#') 400 thawer.next ();
399 continue; 401
400 if ((cp = strchr (buf, '\n')) != NULL) 402 switch (thawer.kw)
401 *cp = '\0';
402 cp = buf;
403 while (*cp == ' ') /* Skip blanks */
404 cp++;
405 if (!strncmp (cp, "name", 4))
406 { 403 {
404 case KW_name:
407 /* clean up the previous entry */ 405 /* clean up the previous entry */
408 if (mt->next != NULL) 406 if (mt->next)
409 { 407 {
410 if (mt->description == NULL) 408 if (!mt->description)
411 mt->description = mt->name; 409 mt->description = mt->name;
410
412 mt = mt->next; 411 mt = mt->next;
413 } 412 }
413
414 mt->next = get_empty_mat (); 414 mt->next = get_empty_mat ();
415 mt->name = strchr (cp, ' ') + 1; 415 thawer.get (mt->name);
416 } 416 break;
417 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:
418 { 427 {
419 mt->description = strchr (cp, ' ') + 1; 428 const char *cp = thawer.get_str () - 1;
420 } 429
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++) 430 for (int i = 0; i < NROFATTACKS; i++)
429 {
430 if (cp == NULL)
431 { 431 {
432 if (!cp)
433 {
432 mt->save[i] = 0; 434 mt->save[i] = 0;
433 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, ',');
434 } 443 }
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 { 444 }
447 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++)
448 { 452 {
453 if (!cp)
454 {
449 mt->save[i] = 0; 455 mt->save[i] = 0;
450 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, ',');
451 } 464 }
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 } 465 }
459 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;
460 { 488 }
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 } 489 }
490
491done:
496 if (mt->next) 492 if (mt->next)
497 { 493 {
498 delete mt->next; 494 delete mt->next;
499 495
500 mt->next = NULL; 496 mt->next = 0;
501 } 497 }
498
502 LOG (llevDebug, "Done.\n"); 499 LOG (llevDebug, "Done.\n");
503 fclose (fp);
504} 500}
505 501
506/* 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
507 * 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
508 * information, having it here probably makes more sense. 504 * information, having it here probably makes more sense.
… …
518 514
519 /* 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,
520 * 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
521 * will not be a good thing. 517 * will not be a good thing.
522 */ 518 */
523 if ((fp = open_and_uncompress (buf, 0, &comp)) == NULL) 519 if (!(fp = open_and_uncompress (buf, 0, &comp)))
524 { 520 {
525 LOG (llevError, "Warning: No settings file found\n"); 521 LOG (llevError, "Error: No settings file found\n");
526 return; 522 exit (1);
527 } 523 }
524
528 while (fgets (buf, MAX_BUF - 1, fp) != NULL) 525 while (fgets (buf, MAX_BUF - 1, fp) != NULL)
529 { 526 {
530 if (buf[0] == '#') 527 if (buf[0] == '#')
531 continue; 528 continue;
532 /* eliminate newline */ 529 /* eliminate newline */
… …
546 *cp++ = 0; 543 *cp++ = 0;
547 has_val = 1; 544 has_val = 1;
548 } 545 }
549 else 546 else
550 { 547 {
551 cp = ""; 548 cp = (char *)"";
552 has_val = 0; 549 has_val = 0;
553 } 550 }
554 551
555 if (!strcasecmp (buf, "motd")) 552 if (!strcasecmp (buf, "motd"))
556 { 553 {
… …
726 else 723 else
727 { 724 {
728 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);
729 } 726 }
730 } 727 }
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, "explore_mode"))
762 {
763 if (!strcasecmp (cp, "on") || !strcasecmp (cp, "true"))
764 {
765 settings.explore_mode = TRUE;
766 }
767 else if (!strcasecmp (cp, "off") || !strcasecmp (cp, "false"))
768 {
769 settings.explore_mode = FALSE;
770 }
771 else
772 {
773 LOG (llevError, "load_settings: Unknown value for " "explore_mode: %s\n", cp);
774 }
775 }
776 else if (!strcasecmp (buf, "spellpoint_level_depend")) 728 else if (!strcasecmp (buf, "spellpoint_level_depend"))
777 { 729 {
778 if (!strcasecmp (cp, "on") || !strcasecmp (cp, "true")) 730 if (!strcasecmp (cp, "on") || !strcasecmp (cp, "true"))
779 { 731 {
780 settings.spellpoint_level_depend = TRUE; 732 settings.spellpoint_level_depend = TRUE;
… …
884 } 836 }
885 else if (!strcasecmp (buf, "set_friendly_fire")) 837 else if (!strcasecmp (buf, "set_friendly_fire"))
886 { 838 {
887 int val = atoi (cp); 839 int val = atoi (cp);
888 840
889#if COZY_SERVER
890 if (val < 0 || val > 100) 841 if (val < 0 || val > 100)
891 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);
892#else
893 if (val < 1 || val > 100)
894 LOG (llevError, "load_settings: set_friendly_fire must be between 1 an 100" ", %d is invalid\n", val);
895#endif
896 else 843 else
897 settings.set_friendly_fire = val; 844 settings.set_friendly_fire = val;
898 } 845 }
899 else if (!strcasecmp (buf, "armor_max_enchant")) 846 else if (!strcasecmp (buf, "armor_max_enchant"))
900 { 847 {
… …
953 { 900 {
954 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);
955 } 902 }
956 903
957 } 904 }
958 else if (!strcasecmp (buf, "no_player_stealing"))
959 {
960 if (!strcasecmp (cp, "on") || !strcasecmp (cp, "true"))
961 {
962 settings.no_player_stealing = TRUE;
963 }
964 else if (!strcasecmp (cp, "off") || !strcasecmp (cp, "false"))
965 {
966 settings.no_player_stealing = FALSE;
967 }
968 else
969 {
970 LOG (llevError, "load_settings: unknown value for no_player_stealing: %s\n", cp);
971 }
972
973 }
974 else if (!strcasecmp (buf, "create_home_portals"))
975 {
976 if (!strcasecmp (cp, "on") || !strcasecmp (cp, "true"))
977 {
978 settings.create_home_portals = TRUE;
979 }
980 else if (!strcasecmp (cp, "off") || !strcasecmp (cp, "false"))
981 {
982 settings.create_home_portals = FALSE;
983 }
984 else
985 {
986 LOG (llevError, "load_settings: Unknown value for create_home_portals: %s\n", cp);
987 }
988
989 }
990 else 905 else
991 {
992 LOG (llevError, "Unknown value in settings file: %s\n", buf); 906 LOG (llevError, "Unknown value in settings file: %s\n", buf);
993 }
994 } 907 }
995 908
996 close_and_delete (fp, comp); 909 close_and_delete (fp, comp);
997} 910}
998
999 911
1000/* 912/*
1001 * init() is called only once, when starting the program. 913 * init() is called only once, when starting the program.
1002 */ 914 */
1003
1004void 915void
1005init (int argc, char **argv) 916init (int argc, char **argv)
1006{ 917{
1007 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
1008 logfile = stderr; 921 logfile = stderr;
922 init_environ ();
1009 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
1010 * nothing, but in future specifying the 924 * nothing, but in future specifying the
1011 * LibDir in this pass would be reasonable*/ 925 * LibDir in this pass would be reasonable*/
1012 926
927 init_anim (); // Must be called before perl
1013 cfperl_init (); 928 cfperl_init ();
1014 init_library (); /* Must be called early */ 929 init_library (); /* Must be called early */
1015 load_settings (); /* Load the settings file */ 930 load_settings (); /* Load the settings file */
1016 load_materials (); 931 load_materials ();
1017 parse_args (argc, argv, 2); 932 parse_args (argc, argv, 2);
… …
1024 { 939 {
1025 fprintf (logfile, "Maintained locally by: %s\n", settings.dm_mail); 940 fprintf (logfile, "Maintained locally by: %s\n", settings.dm_mail);
1026 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");
1027 } 942 }
1028 943
1029 SRANDOM (time (NULL));
1030
1031 init_startup (); /* Write (C), check shutdown/forbid files */ 944 init_startup (); /* Write (C), check shutdown/forbid files */
1032 init_uuid (); 945 init_uuid ();
1033 init_signals (); /* Sets up signal interceptions */ 946 init_signals (); /* Sets up signal interceptions */
1034 init_commands (); /* Sort command tables */ 947 init_commands (); /* Sort command tables */
1035 init_skills (); 948 init_skills ();
1036 949
1037 parse_args (argc, argv, 3); 950 parse_args (argc, argv, 3);
1038 951
1039 if (settings.daemonmode)
1040 logfile = BecomeDaemon (settings.logfilename[0] == '\0' ? "logfile" : settings.logfilename);
1041
1042 init_beforeplay (); 952 init_beforeplay ();
1043 init_ericserver ();
1044 init_done = 1; 953 init_done = 1;
1045} 954}
1046 955
1047void 956void
1048usage (void) 957usage (void)
… …
1096} 1005}
1097 1006
1098void 1007void
1099init_beforeplay (void) 1008init_beforeplay (void)
1100{ 1009{
1101 init_archetypes (); /* If not called before, reads all archetypes from file */
1102 init_artifacts (); /* If not called before, reads all artifacts from file */ 1010 init_artifacts (); /* If not called before, reads all artifacts from file */
1103 init_spells (); /* If not called before, links archtypes used by spells */ 1011 init_spells (); /* If not called before, links archtypes used by spells */
1104 init_regions (); /* If not called before, reads all regions from file */
1105 init_archetype_pointers (); /* Setup global pointers to archetypes */ 1012 init_archetype_pointers (); /* Setup global pointers to archetypes */
1106 init_races (); /* overwrite race designations using entries in lib/races file */ 1013 init_races (); /* overwrite race designations using entries in lib/races file */
1107 init_gods (); /* init linked list of gods from archs */ 1014 init_gods (); /* init linked list of gods from archs */
1108 init_readable (); /* inits useful arrays for readable texts */ 1015 init_readable (); /* inits useful arrays for readable texts */
1109 init_formulae (); /* If not called before, reads formulae from file */ 1016 init_formulae (); /* If not called before, reads formulae from file */
1110
1111 switch (settings.dumpvalues)
1112 {
1113 case 1:
1114 print_monsters ();
1115 exit (0);
1116 case 2:
1117 dump_abilities ();
1118 exit (0);
1119 case 3:
1120 dump_artifacts ();
1121 exit (0);
1122 case 4:
1123 dump_spells ();
1124 exit (0);
1125 case 5:
1126 exit (0);
1127 case 6:
1128 dump_races ();
1129 exit (0);
1130 case 7:
1131 dump_alchemy ();
1132 exit (0);
1133 case 9:
1134 dump_alchemy_costs ();
1135 exit (0);
1136 case 10:
1137 dump_monster_treasure (settings.dumparg);
1138 exit (0);
1139 }
1140} 1017}
1141 1018
1142void 1019void
1143init_startup (void) 1020init_startup (void)
1144{ 1021{
… …
1228 exit (-1); 1105 exit (-1);
1229} 1106}
1230 1107
1231/* Signal handlers: */ 1108/* Signal handlers: */
1232 1109
1233void 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
1234rec_sigsegv (int i) 1120rec_sigsegv (int i)
1235{ 1121{
1122 signal (SIGSEGV, SIG_DFL);
1123
1236 LOG (llevError, "SIGSEGV received.\n"); 1124 LOG (llevError, "SIGSEGV received.\n");
1237 cleanup ("SIGSEGV received", 1); 1125 cleanup ("SIGSEGV received", 1);
1238} 1126}
1239 1127
1240void 1128static void
1241rec_sigint (int i)
1242{
1243 LOG (llevInfo, "SIGINT received.\n");
1244 cleanup ("SIGINT received", 0);
1245}
1246
1247void
1248rec_sighup (int i)
1249{
1250 LOG (llevInfo, "SIGHUP received\n");
1251
1252 cleanup ("SIGHUP received", 0);
1253}
1254
1255void
1256rec_sigquit (int i) 1129rec_sigquit (int i)
1257{ 1130{
1131 signal (SIGQUIT, SIG_IGN);
1132
1258 LOG (llevInfo, "SIGQUIT received\n"); 1133 LOG (llevInfo, "SIGQUIT received\n");
1259 cleanup ("SIGQUIT received", 1); 1134 cleanup ("SIGQUIT received", 1);
1260} 1135}
1261 1136
1262void 1137static void
1263rec_sigbus (int i) 1138rec_sigbus (int i)
1264{ 1139{
1140 signal (SIGBUS, SIG_DFL);
1141
1265 LOG (llevError, "SIGBUS received\n"); 1142 LOG (llevError, "SIGBUS received\n");
1266 cleanup ("SIGBUS received", 1); 1143 cleanup ("SIGBUS received", 1);
1267} 1144}
1268 1145
1269void 1146void
1270rec_sigterm (int i) 1147reset_signals ()
1271{ 1148{
1272 LOG (llevInfo, "SIGTERM received\n"); 1149 signal (SIGABRT, SIG_DFL);
1273 cleanup ("SIGTERM received", 0); 1150 signal (SIGQUIT, SIG_DFL);
1151 signal (SIGSEGV, SIG_DFL);
1152 signal (SIGBUS , SIG_DFL);
1153 signal (SIGINT , SIG_DFL);
1154 signal (SIGTERM, SIG_DFL);
1274} 1155}
1275 1156
1276void 1157void
1277init_signals (void) 1158init_signals (void)
1278{ 1159{
1279 signal (SIGPIPE, SIG_IGN); 1160 // large stack, but it's important data we want to save, and it is not usually
1280 signal (SIGHUP, rec_sighup); 1161 // being physically allocated anyways
1281 signal (SIGINT, rec_sigint); 1162 const size_t stacksize = 8 * 1024 * 1024 + SIGSTKSZ;
1282 signal (SIGQUIT, rec_sigquit); 1163
1283 signal (SIGSEGV, rec_sigsegv); 1164 stack_t ss;
1284 signal (SIGBUS, rec_sigbus); 1165 ss.ss_sp = malloc (stacksize);
1285 signal (SIGTERM, rec_sigterm); 1166 ss.ss_flags = 0;
1167 ss.ss_size = stacksize;
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);
1286} 1182}
1287 1183
1288/* init_races() - reads the races file in the lib/ directory, then 1184/* init_races() - reads the races file in the lib/ directory, then
1289 * overwrites old 'race' entries. This routine allow us to quickly 1185 * overwrites old 'race' entries. This routine allow us to quickly
1290 * re-configure the 'alignment' of monsters, objects. Useful for 1186 * re-configure the 'alignment' of monsters, objects. Useful for
… …
1330 set_list = 0; 1226 set_list = 0;
1331 cp++; 1227 cp++;
1332 } 1228 }
1333 1229
1334 if (sscanf (cp, "RACE %s", variable)) 1230 if (sscanf (cp, "RACE %s", variable))
1335 { /* set new race value */ 1231 /* set new race value */
1336 strcpy (race, variable); 1232 strcpy (race, variable);
1337 }
1338 else 1233 else
1339 { 1234 {
1340 char *cp1; 1235 char *cp1;
1341 1236
1342 /* Take out beginning spaces */ 1237 /* Take out beginning spaces */
… …
1356 /* set creature race to race value */ 1251 /* set creature race to race value */
1357 if ((mon = archetype::find (cp)) == NULL) 1252 if ((mon = archetype::find (cp)) == NULL)
1358 LOG (llevError, "Creature %s in race file lacks archetype\n", cp); 1253 LOG (llevError, "Creature %s in race file lacks archetype\n", cp);
1359 else 1254 else
1360 { 1255 {
1361 if (set_race && (!mon->clone.race || strcmp (mon->clone.race, race))) 1256 if (set_race && (!mon->race || strcmp (mon->race, race)))
1362 { 1257 {
1363 if (mon->clone.race) 1258 if (mon->race)
1364 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);
1365 1260
1366 mon->clone.race = race; 1261 mon->race = race;
1367 } 1262 }
1368 1263
1369 /* 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 */
1370 if (set_list && QUERY_FLAG (&mon->clone, FLAG_MONSTER)) 1265 if (set_list && QUERY_FLAG (mon, FLAG_MONSTER))
1371 add_to_racelist (race, &mon->clone); 1266 add_to_racelist (race, mon);
1372 } 1267 }
1373 } 1268 }
1374 } 1269 }
1375 1270
1376 fclose (file); 1271 fclose (file);
… …
1385 1280
1386 for (list = first_race; list; list = list->next) 1281 for (list = first_race; list; list = list->next)
1387 { 1282 {
1388 fprintf (stderr, "\nRACE %s:\t", &list->name); 1283 fprintf (stderr, "\nRACE %s:\t", &list->name);
1389 for (tmp = list->member; tmp; tmp = tmp->next) 1284 for (tmp = list->member; tmp; tmp = tmp->next)
1390 fprintf (stderr, "%s(%d), ", &tmp->ob->arch->name, tmp->ob->level); 1285 fprintf (stderr, "%s(%d), ", &tmp->ob->arch->archname, tmp->ob->level);
1391 } 1286 }
1392 1287
1393 fprintf (stderr, "\n"); 1288 fprintf (stderr, "\n");
1394} 1289}
1395 1290

Diff Legend

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