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.36 by root, Fri Jan 19 15:15:50 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.
21 * 20 *
22 * The authors can be reached via e-mail at <crossfire@schmorp.de> 21 * The authors can be reached via e-mail to <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>
… …
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, "spellpoint_level_depend")) 728 else if (!strcasecmp (buf, "spellpoint_level_depend"))
762 { 729 {
763 if (!strcasecmp (cp, "on") || !strcasecmp (cp, "true")) 730 if (!strcasecmp (cp, "on") || !strcasecmp (cp, "true"))
764 { 731 {
765 settings.spellpoint_level_depend = TRUE; 732 settings.spellpoint_level_depend = TRUE;
… …
869 } 836 }
870 else if (!strcasecmp (buf, "set_friendly_fire")) 837 else if (!strcasecmp (buf, "set_friendly_fire"))
871 { 838 {
872 int val = atoi (cp); 839 int val = atoi (cp);
873 840
874#if COZY_SERVER
875 if (val < 0 || val > 100) 841 if (val < 0 || val > 100)
876 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);
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 843 else
882 settings.set_friendly_fire = val; 844 settings.set_friendly_fire = val;
883 } 845 }
884 else if (!strcasecmp (buf, "armor_max_enchant")) 846 else if (!strcasecmp (buf, "armor_max_enchant"))
885 { 847 {
… …
938 { 900 {
939 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);
940 } 902 }
941 903
942 } 904 }
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 905 else
976 {
977 LOG (llevError, "Unknown value in settings file: %s\n", buf); 906 LOG (llevError, "Unknown value in settings file: %s\n", buf);
978 }
979 } 907 }
980 908
981 close_and_delete (fp, comp); 909 close_and_delete (fp, comp);
982} 910}
983
984 911
985/* 912/*
986 * init() is called only once, when starting the program. 913 * init() is called only once, when starting the program.
987 */ 914 */
988
989void 915void
990init (int argc, char **argv) 916init (int argc, char **argv)
991{ 917{
918 init_done = 0; /* Must be done before init_signal() */
992 rndm.seed (time (0)); 919 rndm.seed (time (0));
993 920
994 init_done = 0; /* Must be done before init_signal() */
995 logfile = stderr; 921 logfile = stderr;
922 init_environ ();
996 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
997 * nothing, but in future specifying the 924 * nothing, but in future specifying the
998 * LibDir in this pass would be reasonable*/ 925 * LibDir in this pass would be reasonable*/
999 926
927 init_anim (); // Must be called before perl
1000 cfperl_init (); 928 cfperl_init ();
1001 init_library (); /* Must be called early */ 929 init_library (); /* Must be called early */
1002 load_settings (); /* Load the settings file */ 930 load_settings (); /* Load the settings file */
1003 load_materials (); 931 load_materials ();
1004 parse_args (argc, argv, 2); 932 parse_args (argc, argv, 2);
… …
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)
… …
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 */ 1011 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 */ 1012 init_archetype_pointers (); /* Setup global pointers to archetypes */
1091 init_races (); /* overwrite race designations using entries in lib/races file */ 1013 init_races (); /* overwrite race designations using entries in lib/races file */
1092 init_gods (); /* init linked list of gods from archs */ 1014 init_gods (); /* init linked list of gods from archs */
1093 init_readable (); /* inits useful arrays for readable texts */ 1015 init_readable (); /* inits useful arrays for readable texts */
1094 init_formulae (); /* If not called before, reads formulae from file */ 1016 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} 1017}
1126 1018
1127void 1019void
1128init_startup (void) 1020init_startup (void)
1129{ 1021{
… …
1213 exit (-1); 1105 exit (-1);
1214} 1106}
1215 1107
1216/* Signal handlers: */ 1108/* Signal handlers: */
1217 1109
1218void 1110static void
1219rec_sigabrt (int i) 1111rec_sigabrt (int i)
1220{ 1112{
1221 signal (SIGABRT, SIG_DFL); 1113 signal (SIGABRT, SIG_DFL);
1222 1114
1223 LOG (llevError, "SIGABRT received.\n"); 1115 LOG (llevError, "SIGABRT received.\n");
1224 cleanup ("SIGABRT received", 1); 1116 cleanup ("SIGABRT received", 1);
1225} 1117}
1226 1118
1227void 1119static void
1228rec_sigsegv (int i) 1120rec_sigsegv (int i)
1229{ 1121{
1230 signal (SIGSEGV, SIG_DFL); 1122 signal (SIGSEGV, SIG_DFL);
1231 1123
1232 LOG (llevError, "SIGSEGV received.\n"); 1124 LOG (llevError, "SIGSEGV received.\n");
1233 cleanup ("SIGSEGV received", 1); 1125 cleanup ("SIGSEGV received", 1);
1234} 1126}
1235 1127
1236void 1128static void
1237rec_sigquit (int i) 1129rec_sigquit (int i)
1238{ 1130{
1239 signal (SIGQUIT, SIG_IGN); 1131 signal (SIGQUIT, SIG_IGN);
1240 1132
1241 LOG (llevInfo, "SIGQUIT received\n"); 1133 LOG (llevInfo, "SIGQUIT received\n");
1242 cleanup ("SIGQUIT received", 1); 1134 cleanup ("SIGQUIT received", 1);
1243} 1135}
1244 1136
1245void 1137static void
1246rec_sigbus (int i) 1138rec_sigbus (int i)
1247{ 1139{
1248 signal (SIGBUS, SIG_DFL); 1140 signal (SIGBUS, SIG_DFL);
1249 1141
1250 LOG (llevError, "SIGBUS received\n"); 1142 LOG (llevError, "SIGBUS received\n");
1251 cleanup ("SIGBUS received", 1); 1143 cleanup ("SIGBUS received", 1);
1252} 1144}
1253 1145
1254void 1146void
1147reset_signals ()
1148{
1149 signal (SIGABRT, SIG_DFL);
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);
1155}
1156
1157void
1255init_signals (void) 1158init_signals (void)
1256{ 1159{
1257 signal (SIGPIPE, SIG_IGN); 1160 // large stack, but it's important data we want to save, and it is not usually
1258 signal (SIGABRT, rec_sigabrt); 1161 // being physically allocated anyways
1259 signal (SIGQUIT, rec_sigquit); 1162 const size_t stacksize = 8 * 1024 * 1024 + SIGSTKSZ;
1260 signal (SIGSEGV, rec_sigsegv); 1163
1261 signal (SIGBUS, rec_sigbus); 1164 stack_t ss;
1165 ss.ss_sp = malloc (stacksize);
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);
1262} 1182}
1263 1183
1264/* init_races() - reads the races file in the lib/ directory, then 1184/* init_races() - reads the races file in the lib/ directory, then
1265 * overwrites old 'race' entries. This routine allow us to quickly 1185 * overwrites old 'race' entries. This routine allow us to quickly
1266 * re-configure the 'alignment' of monsters, objects. Useful for 1186 * re-configure the 'alignment' of monsters, objects. Useful for
… …
1306 set_list = 0; 1226 set_list = 0;
1307 cp++; 1227 cp++;
1308 } 1228 }
1309 1229
1310 if (sscanf (cp, "RACE %s", variable)) 1230 if (sscanf (cp, "RACE %s", variable))
1311 { /* set new race value */ 1231 /* set new race value */
1312 strcpy (race, variable); 1232 strcpy (race, variable);
1313 }
1314 else 1233 else
1315 { 1234 {
1316 char *cp1; 1235 char *cp1;
1317 1236
1318 /* Take out beginning spaces */ 1237 /* Take out beginning spaces */
… …
1332 /* set creature race to race value */ 1251 /* set creature race to race value */
1333 if ((mon = archetype::find (cp)) == NULL) 1252 if ((mon = archetype::find (cp)) == NULL)
1334 LOG (llevError, "Creature %s in race file lacks archetype\n", cp); 1253 LOG (llevError, "Creature %s in race file lacks archetype\n", cp);
1335 else 1254 else
1336 { 1255 {
1337 if (set_race && (!mon->clone.race || strcmp (mon->clone.race, race))) 1256 if (set_race && (!mon->race || strcmp (mon->race, race)))
1338 { 1257 {
1339 if (mon->clone.race) 1258 if (mon->race)
1340 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);
1341 1260
1342 mon->clone.race = race; 1261 mon->race = race;
1343 } 1262 }
1344 1263
1345 /* 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 */
1346 if (set_list && QUERY_FLAG (&mon->clone, FLAG_MONSTER)) 1265 if (set_list && QUERY_FLAG (mon, FLAG_MONSTER))
1347 add_to_racelist (race, &mon->clone); 1266 add_to_racelist (race, mon);
1348 } 1267 }
1349 } 1268 }
1350 } 1269 }
1351 1270
1352 fclose (file); 1271 fclose (file);
… …
1361 1280
1362 for (list = first_race; list; list = list->next) 1281 for (list = first_race; list; list = list->next)
1363 { 1282 {
1364 fprintf (stderr, "\nRACE %s:\t", &list->name); 1283 fprintf (stderr, "\nRACE %s:\t", &list->name);
1365 for (tmp = list->member; tmp; tmp = tmp->next) 1284 for (tmp = list->member; tmp; tmp = tmp->next)
1366 fprintf (stderr, "%s(%d), ", &tmp->ob->arch->name, tmp->ob->level); 1285 fprintf (stderr, "%s(%d), ", &tmp->ob->arch->archname, tmp->ob->level);
1367 } 1286 }
1368 1287
1369 fprintf (stderr, "\n"); 1288 fprintf (stderr, "\n");
1370} 1289}
1371 1290

Diff Legend

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