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.21 by root, Wed Dec 20 09:14:22 2006 UTC vs.
Revision 1.45 by root, Thu Apr 12 14:18:05 2007 UTC

1/* 1/*
2 CrossFire, A Multiplayer game for X-windows 2 * CrossFire, A Multiplayer game
3 3 *
4 * Copyright (C) 2005, 2006, 2007 Marc Lehmann & Crossfire+ Development Team
4 Copyright (C) 2002 Mark Wedel & Crossfire Development Team 5 * Copyright (C) 2002 Mark Wedel & Crossfire Development Team
5 Copyright (C) 1992 Frank Tore Johansen 6 * Copyright (C) 1992 Frank Tore Johansen
6 7 *
7 This program is free software; you can redistribute it and/or modify 8 * This program 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 2 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, write to the Free Software
19 Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. 20 * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, 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 at <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#ifndef __CEXTRACT__
28# include <sproto.h> 28#include <sproto.h>
29#endif
30
31/* global weathermap */
32weathermap_t **weathermap;
33 29
34void 30void
35set_logfile (char *val) 31set_logfile (char *val)
36{ 32{
37 settings.logfilename = val; 33 settings.logfilename = val;
… …
241 * pass system very easy, and it is very easy to add in new options. 237 * pass system very easy, and it is very easy to add in new options.
242 */ 238 */
243struct Command_Line_Options options[] = { 239struct Command_Line_Options options[] = {
244 240
245/* Pass 1 functions - STuff that can/should be called before we actually 241/* Pass 1 functions - STuff that can/should be called before we actually
246 * initialize any data. 242 * initialise any data.
247 */ 243 */
248 {"-h", 0, 1, help}, 244 {"-h", 0, 1, help},
249 245
250/* Honor -help also, since it is somewhat common */ 246/* Honor -help also, since it is somewhat common */
251 {"-help", 0, 1, help}, 247 {"-help", 0, 1, help},
… …
378} 374}
379 375
380static void 376static void
381load_materials (void) 377load_materials (void)
382{ 378{
383 char buf[MAX_BUF], filename[MAX_BUF], *cp, *next; 379 char filename[MAX_BUF];
384 FILE *fp;
385 materialtype_t *mt; 380 materialtype_t *mt;
386 int i, value;
387 381
388 sprintf (filename, "%s/materials", settings.datadir); 382 sprintf (filename, "%s/materials", settings.datadir);
389 LOG (llevDebug, "Reading material type data from %s...", filename); 383 LOG (llevDebug, "Reading material type data from %s...\n", filename);
390 if ((fp = fopen (filename, "r")) == NULL) 384
385 object_thawer thawer (filename);
386
387 if (!thawer)
391 { 388 {
392 LOG (llevError, "Cannot open %s for reading\n", filename); 389 LOG (llevError, "Cannot open %s for reading\n", filename);
393 mt = get_empty_mat (); 390 mt = get_empty_mat ();
394 mt->next = NULL; 391 mt->next = 0;
395 materialt = mt; 392 materialt = mt;
396 return; 393 return;
397 } 394 }
395
398 mt = get_empty_mat (); 396 mt = get_empty_mat ();
399 materialt = mt; 397 materialt = mt;
400 while (fgets (buf, MAX_BUF, fp) != NULL) 398
399 for (;;)
401 { 400 {
402 if (*buf == '#') 401 switch (thawer.get_kv ())
403 continue;
404 if ((cp = strchr (buf, '\n')) != NULL)
405 *cp = '\0';
406 cp = buf;
407 while (*cp == ' ') /* Skip blanks */
408 cp++;
409 if (!strncmp (cp, "name", 4))
410 { 402 {
403 case KW_name:
411 /* clean up the previous entry */ 404 /* clean up the previous entry */
412 if (mt->next != NULL) 405 if (mt->next)
413 { 406 {
414 if (mt->description == NULL) 407 if (!mt->description)
415 mt->description = mt->name; 408 mt->description = mt->name;
409
416 mt = mt->next; 410 mt = mt->next;
417 } 411 }
412
418 mt->next = get_empty_mat (); 413 mt->next = get_empty_mat ();
419 mt->name = strchr (cp, ' ') + 1; 414 thawer.get (mt->name);
420 } 415 break;
421 else if (!strncmp (cp, "description", 11)) 416
417 case KW_description:
418 thawer.get (mt->description);
419 break;
420
421 case KW_material:
422 thawer.get (mt->material);
423 break;
424
425 case KW_saves:
422 { 426 {
423 mt->description = strchr (cp, ' ') + 1; 427 const char *cp = thawer.get_str () - 1;
424 } 428
425 else if (sscanf (cp, "material %d", &value))
426 {
427 mt->material = value;
428 }
429 else if (!strncmp (cp, "saves", 5))
430 {
431 cp = strchr (cp, ' ') + 1;
432 for (i = 0; i < NROFATTACKS; i++) 429 for (int i = 0; i < NROFATTACKS; i++)
433 {
434 if (cp == NULL)
435 { 430 {
431 if (!cp)
432 {
436 mt->save[i] = 0; 433 mt->save[i] = 0;
437 continue; 434 continue;
435 }
436
437 int value;
438 ++cp;
439 sscanf (cp, "%d", &value);
440 mt->save[i] = (sint8) value;
441 cp = strchr (cp, ',');
438 } 442 }
439 if ((next = strchr (cp, ',')) != NULL)
440 *(next++) = '\0';
441 sscanf (cp, "%d", &value);
442 mt->save[i] = (sint8) value;
443 cp = next;
444 }
445 }
446 else if (!strncmp (cp, "mods", 4))
447 {
448 cp = strchr (cp, ' ') + 1;
449 for (i = 0; i < NROFATTACKS; i++)
450 { 443 }
451 if (cp == NULL) 444 break;
445
446 case KW_mods:
447 {
448 const char *cp = thawer.get_str () - 1;
449
450 for (int i = 0; i < NROFATTACKS; i++)
452 { 451 {
452 if (!cp)
453 {
453 mt->save[i] = 0; 454 mt->save[i] = 0;
454 continue; 455 continue;
456 }
457
458 ++cp;
459 int value;
460 sscanf (cp, "%d", &value);
461 mt->mod[i] = (sint8) value;
462 cp = strchr (cp, ',');
455 } 463 }
456 if ((next = strchr (cp, ',')) != NULL)
457 *(next++) = '\0';
458 sscanf (cp, "%d", &value);
459 mt->mod[i] = (sint8) value;
460 cp = next;
461 }
462 } 464 }
463 else if (sscanf (cp, "chance %d\n", &value)) 465 break;
466
467 case KW_chance: thawer.get (mt->chance); break;
468 case KW_difficulty: // cf+ alias, not original cf
469 case KW_diff: thawer.get (mt->difficulty); break;
470 case KW_magic: thawer.get (mt->magic); break;
471 case KW_dam: // cf+ alias, not original cf
472 case KW_damage: thawer.get (mt->damage); break;
473 case KW_wc: thawer.get (mt->wc); break;
474 case KW_ac: thawer.get (mt->ac); break;
475 case KW_sp: thawer.get (mt->sp); break;
476 case KW_weight: thawer.get (mt->weight); break;
477 case KW_value: thawer.get (mt->value); break;
478 case KW_density: thawer.get (mt->density); break;
479
480 case KW_EOF:
481 goto done;
482
483 default:
484 if (!thawer.parse_error ("materials file", "materials"))
485 goto done;
486 break;
464 { 487 }
465 mt->chance = (sint8) value;
466 }
467 else if (sscanf (cp, "diff %d\n", &value))
468 {
469 mt->difficulty = (sint8) value;
470 }
471 else if (sscanf (cp, "magic %d\n", &value))
472 {
473 mt->magic = (sint8) value;
474 }
475 else if (sscanf (cp, "damage %d\n", &value))
476 {
477 mt->damage = (sint8) value;
478 }
479 else if (sscanf (cp, "wc %d\n", &value))
480 {
481 mt->wc = (sint8) value;
482 }
483 else if (sscanf (cp, "ac %d\n", &value))
484 {
485 mt->ac = (sint8) value;
486 }
487 else if (sscanf (cp, "sp %d\n", &value))
488 {
489 mt->sp = (sint8) value;
490 }
491 else if (sscanf (cp, "weight %d\n", &value))
492 {
493 mt->weight = value;
494 }
495 else if (sscanf (cp, "value %d\n", &value))
496 {
497 mt->value = value;
498 }
499 } 488 }
489
490done:
500 if (mt->next) 491 if (mt->next)
501 { 492 {
502 delete mt->next; 493 delete mt->next;
503 494
504 mt->next = NULL; 495 mt->next = 0;
505 } 496 }
497
506 LOG (llevDebug, "Done.\n"); 498 LOG (llevDebug, "Done.\n");
507 fclose (fp);
508} 499}
509 500
510/* This loads the settings file. There could be debate whether this should 501/* This loads the settings file. There could be debate whether this should
511 * be here or in the common directory - but since only the server needs this 502 * be here or in the common directory - but since only the server needs this
512 * information, having it here probably makes more sense. 503 * information, having it here probably makes more sense.
… …
522 513
523 /* We don't require a settings file at current time, but down the road, 514 /* We don't require a settings file at current time, but down the road,
524 * there will probably be so many values that not having a settings file 515 * there will probably be so many values that not having a settings file
525 * will not be a good thing. 516 * will not be a good thing.
526 */ 517 */
527 if ((fp = open_and_uncompress (buf, 0, &comp)) == NULL) 518 if (!(fp = open_and_uncompress (buf, 0, &comp)))
528 { 519 {
529 LOG (llevError, "Warning: No settings file found\n"); 520 LOG (llevError, "Error: No settings file found\n");
530 return; 521 exit (1);
531 } 522 }
523
532 while (fgets (buf, MAX_BUF - 1, fp) != NULL) 524 while (fgets (buf, MAX_BUF - 1, fp) != NULL)
533 { 525 {
534 if (buf[0] == '#') 526 if (buf[0] == '#')
535 continue; 527 continue;
536 /* eliminate newline */ 528 /* eliminate newline */
… …
550 *cp++ = 0; 542 *cp++ = 0;
551 has_val = 1; 543 has_val = 1;
552 } 544 }
553 else 545 else
554 { 546 {
555 cp = ""; 547 cp = (char *)"";
556 has_val = 0; 548 has_val = 0;
557 } 549 }
558 550
559 if (!strcasecmp (buf, "motd")) 551 if (!strcasecmp (buf, "motd"))
560 { 552 {
… …
758 settings.real_wiz = FALSE; 750 settings.real_wiz = FALSE;
759 } 751 }
760 else 752 else
761 { 753 {
762 LOG (llevError, "load_settings: Unknown value for " "real_wiz: %s\n", cp); 754 LOG (llevError, "load_settings: Unknown value for " "real_wiz: %s\n", cp);
763 }
764 }
765 else if (!strcasecmp (buf, "explore_mode"))
766 {
767 if (!strcasecmp (cp, "on") || !strcasecmp (cp, "true"))
768 {
769 settings.explore_mode = TRUE;
770 }
771 else if (!strcasecmp (cp, "off") || !strcasecmp (cp, "false"))
772 {
773 settings.explore_mode = FALSE;
774 }
775 else
776 {
777 LOG (llevError, "load_settings: Unknown value for " "explore_mode: %s\n", cp);
778 } 755 }
779 } 756 }
780 else if (!strcasecmp (buf, "spellpoint_level_depend")) 757 else if (!strcasecmp (buf, "spellpoint_level_depend"))
781 { 758 {
782 if (!strcasecmp (cp, "on") || !strcasecmp (cp, "true")) 759 if (!strcasecmp (cp, "on") || !strcasecmp (cp, "true"))
… …
998 } 975 }
999 976
1000 close_and_delete (fp, comp); 977 close_and_delete (fp, comp);
1001} 978}
1002 979
1003
1004/* 980/*
1005 * init() is called only once, when starting the program. 981 * init() is called only once, when starting the program.
1006 */ 982 */
1007
1008void 983void
1009init (int argc, char **argv) 984init (int argc, char **argv)
1010{ 985{
1011 init_done = 0; /* Must be done before init_signal() */ 986 init_done = 0; /* Must be done before init_signal() */
987 rndm.seed (time (0));
988
1012 logfile = stderr; 989 logfile = stderr;
990 init_environ ();
1013 parse_args (argc, argv, 1); /* First arg pass - right now it does 991 parse_args (argc, argv, 1); /* First arg pass - right now it does
1014 * nothing, but in future specifying the 992 * nothing, but in future specifying the
1015 * LibDir in this pass would be reasonable*/ 993 * LibDir in this pass would be reasonable*/
1016 994
995 init_anim (); // Must be called before perl
1017 cfperl_init (); 996 cfperl_init ();
1018 init_library (); /* Must be called early */ 997 init_library (); /* Must be called early */
1019 load_settings (); /* Load the settings file */ 998 load_settings (); /* Load the settings file */
1020 init_weather ();
1021 load_materials (); 999 load_materials ();
1022 parse_args (argc, argv, 2); 1000 parse_args (argc, argv, 2);
1023 fprintf (logfile, "Welcome to CrossFire, v%s\n", VERSION); 1001 fprintf (logfile, "Welcome to CrossFire, v%s\n", VERSION);
1002 fprintf (logfile, "Copyright (C) 2005, 2006, 2007 Marc Lehmann.\n");
1024 fprintf (logfile, "Copyright (C) 1994 Mark Wedel.\n"); 1003 fprintf (logfile, "Copyright (C) 1994 Mark Wedel.\n");
1025 fprintf (logfile, "Copyright (C) 1992 Frank Tore Johansen.\n"); 1004 fprintf (logfile, "Copyright (C) 1992 Frank Tore Johansen.\n");
1026 1005
1027 if (strcmp (settings.dm_mail, "") != 0) 1006 if (strcmp (settings.dm_mail, "") != 0)
1028 { 1007 {
1029 fprintf (logfile, "Maintained locally by: %s\n", settings.dm_mail); 1008 fprintf (logfile, "Maintained locally by: %s\n", settings.dm_mail);
1030 fprintf (logfile, "Questions and bugs should be mailed to above address.\n"); 1009 fprintf (logfile, "Questions and bugs should be mailed to above address.\n");
1031 } 1010 }
1032 1011
1033 SRANDOM (time (NULL));
1034
1035 init_startup (); /* Write (C), check shutdown/forbid files */ 1012 init_startup (); /* Write (C), check shutdown/forbid files */
1036 init_uuid (); 1013 init_uuid ();
1037 init_signals (); /* Sets up signal interceptions */ 1014 init_signals (); /* Sets up signal interceptions */
1038 init_commands (); /* Sort command tables */ 1015 init_commands (); /* Sort command tables */
1039 read_map_log (); /* Load up the old temp map files */
1040 init_skills (); 1016 init_skills ();
1041 1017
1042 parse_args (argc, argv, 3); 1018 parse_args (argc, argv, 3);
1043 1019
1044 if (settings.daemonmode) 1020 if (settings.daemonmode)
… …
1214 printf ("Save player:\t<true>\n"); 1190 printf ("Save player:\t<true>\n");
1215 printf ("Save mode:\t%4.4o\n", SAVE_MODE); 1191 printf ("Save mode:\t%4.4o\n", SAVE_MODE);
1216 printf ("Playerdir:\t<VAR>/%s\n", settings.playerdir); 1192 printf ("Playerdir:\t<VAR>/%s\n", settings.playerdir);
1217 printf ("Itemsdir:\t<VAR>/%s\n", settings.uniquedir); 1193 printf ("Itemsdir:\t<VAR>/%s\n", settings.uniquedir);
1218 printf ("Tmpdir:\t\t%s\n", settings.tmpdir); 1194 printf ("Tmpdir:\t\t%s\n", settings.tmpdir);
1219 printf ("Map max timeout:\t%d\n", MAP_MAXTIMEOUT);
1220 printf ("Max objects:\t%d\n", MAX_OBJECTS);
1221#ifdef USE_CALLOC 1195#ifdef USE_CALLOC
1222 printf ("Use_calloc:\t<true>\n"); 1196 printf ("Use_calloc:\t<true>\n");
1223#else 1197#else
1224 printf ("Use_calloc:\t<false>\n"); 1198 printf ("Use_calloc:\t<false>\n");
1225#endif 1199#endif
… …
1236} 1210}
1237 1211
1238/* Signal handlers: */ 1212/* Signal handlers: */
1239 1213
1240void 1214void
1215rec_sigabrt (int i)
1216{
1217 signal (SIGABRT, SIG_DFL);
1218
1219 LOG (llevError, "SIGABRT received.\n");
1220 cleanup ("SIGABRT received", 1);
1221}
1222
1223void
1241rec_sigsegv (int i) 1224rec_sigsegv (int i)
1242{ 1225{
1226 signal (SIGSEGV, SIG_DFL);
1227
1243 LOG (llevError, "SIGSEGV received.\n"); 1228 LOG (llevError, "SIGSEGV received.\n");
1244 fatal_signal (1, 1); 1229 cleanup ("SIGSEGV received", 1);
1245}
1246
1247void
1248rec_sigint (int i)
1249{
1250 LOG (llevInfo, "SIGINT received.\n");
1251 fatal_signal (0, 1);
1252}
1253
1254void
1255rec_sighup (int i)
1256{
1257 LOG (llevInfo, "SIGHUP received\n");
1258
1259 if (init_done)
1260 cleanup ();
1261
1262 exit (0);
1263} 1230}
1264 1231
1265void 1232void
1266rec_sigquit (int i) 1233rec_sigquit (int i)
1267{ 1234{
1235 signal (SIGQUIT, SIG_IGN);
1236
1268 LOG (llevInfo, "SIGQUIT received\n"); 1237 LOG (llevInfo, "SIGQUIT received\n");
1269 fatal_signal (1, 1); 1238 cleanup ("SIGQUIT received", 1);
1270} 1239}
1271 1240
1272void 1241void
1273rec_sigbus (int i) 1242rec_sigbus (int i)
1274{ 1243{
1275#ifdef SIGBUS 1244 signal (SIGBUS, SIG_DFL);
1245
1276 LOG (llevError, "SIGBUS received\n"); 1246 LOG (llevError, "SIGBUS received\n");
1277 fatal_signal (1, 1); 1247 cleanup ("SIGBUS received", 1);
1278#endif
1279}
1280
1281void
1282rec_sigterm (int i)
1283{
1284 LOG (llevInfo, "SIGTERM received\n");
1285 fatal_signal (0, 1);
1286}
1287
1288void
1289fatal_signal (int make_core, int close_sockets)
1290{
1291 cleanup (make_core);
1292} 1248}
1293 1249
1294void 1250void
1295init_signals (void) 1251init_signals (void)
1296{ 1252{
1297 signal (SIGHUP, rec_sighup); 1253 // large stack, but it's important data we want to save, and it is not usually
1298 signal (SIGINT, rec_sigint); 1254 // being physically allocated anyways
1299 signal (SIGQUIT, rec_sigquit); 1255 const size_t stacksize = 8 * 1024 * 1024 + SIGSTKSZ;
1300 signal (SIGSEGV, rec_sigsegv); 1256
1301 signal (SIGPIPE, SIG_IGN); 1257 stack_t ss;
1302#ifdef SIGBUS 1258 ss.ss_sp = malloc (stacksize);
1303 signal (SIGBUS, rec_sigbus); 1259 ss.ss_flags = 0;
1304#endif 1260 ss.ss_size = stacksize;
1305 signal (SIGTERM, rec_sigterm); 1261 sigaltstack (&ss, 0);
1262
1263 struct sigaction sa;
1264
1265 sigfillset (&sa.sa_mask);
1266 sa.sa_flags = SA_ONSTACK | SA_RESTART;
1267
1268 sa.sa_handler = SIG_IGN; sigaction (SIGPIPE, &sa, 0);
1269 sa.sa_handler = rec_sigabrt; sigaction (SIGABRT, &sa, 0);
1270 sa.sa_handler = rec_sigquit; sigaction (SIGQUIT, &sa, 0);
1271 sa.sa_handler = rec_sigsegv; sigaction (SIGSEGV, &sa, 0);
1272 sa.sa_handler = rec_sigbus; sigaction (SIGBUS, &sa, 0);
1306} 1273}
1307 1274
1308/* init_races() - reads the races file in the lib/ directory, then 1275/* init_races() - reads the races file in the lib/ directory, then
1309 * overwrites old 'race' entries. This routine allow us to quickly 1276 * overwrites old 'race' entries. This routine allow us to quickly
1310 * re-configure the 'alignment' of monsters, objects. Useful for 1277 * re-configure the 'alignment' of monsters, objects. Useful for
1311 * putting together lists of creatures, etc that belong to gods. 1278 * putting together lists of creatures, etc that belong to gods.
1312 */ 1279 */
1313
1314void 1280void
1315init_races (void) 1281init_races (void)
1316{ 1282{
1317 FILE *file; 1283 FILE *file;
1318 char race[MAX_BUF], fname[MAX_BUF], buf[MAX_BUF], *cp, variable[MAX_BUF]; 1284 char race[MAX_BUF], fname[MAX_BUF], buf[MAX_BUF], *cp, variable[MAX_BUF];
… …
1323 return; 1289 return;
1324 init_done = 1; 1290 init_done = 1;
1325 first_race = 0; 1291 first_race = 0;
1326 1292
1327 sprintf (fname, "%s/races", settings.datadir); 1293 sprintf (fname, "%s/races", settings.datadir);
1328 LOG (llevDebug, "Reading races from %s...", fname); 1294 LOG (llevDebug, "Reading races from %s...\n", fname);
1329 if (!(file = fopen (fname, "r"))) 1295 if (!(file = fopen (fname, "r")))
1330 { 1296 {
1331 LOG (llevError, "Cannot open races file %s: %s\n", fname, strerror (errno)); 1297 LOG (llevError, "Cannot open races file %s: %s\n", fname, strerror (errno));
1332 return; 1298 return;
1333 } 1299 }
… …
1351 set_list = 0; 1317 set_list = 0;
1352 cp++; 1318 cp++;
1353 } 1319 }
1354 1320
1355 if (sscanf (cp, "RACE %s", variable)) 1321 if (sscanf (cp, "RACE %s", variable))
1356 { /* set new race value */ 1322 /* set new race value */
1357 strcpy (race, variable); 1323 strcpy (race, variable);
1358 }
1359 else 1324 else
1360 { 1325 {
1361 char *cp1; 1326 char *cp1;
1362 1327
1363 /* Take out beginning spaces */ 1328 /* Take out beginning spaces */
… …
1374 if (cp[strlen (cp) - 1] == '\n') 1339 if (cp[strlen (cp) - 1] == '\n')
1375 cp[strlen (cp) - 1] = '\0'; 1340 cp[strlen (cp) - 1] = '\0';
1376 1341
1377 /* set creature race to race value */ 1342 /* set creature race to race value */
1378 if ((mon = archetype::find (cp)) == NULL) 1343 if ((mon = archetype::find (cp)) == NULL)
1379 LOG (llevError, "\nCreature %s in race file lacks archetype", cp); 1344 LOG (llevError, "Creature %s in race file lacks archetype\n", cp);
1380 else 1345 else
1381 { 1346 {
1382 if (set_race && (!mon->clone.race || strcmp (mon->clone.race, race))) 1347 if (set_race && (!mon->clone.race || strcmp (mon->clone.race, race)))
1383 { 1348 {
1384 if (mon->clone.race) 1349 if (mon->clone.race)
1385 LOG (llevDebug, "\n Resetting race to %s from %s for archetype %s", race, &mon->clone.race, &mon->name); 1350 LOG (llevDebug, "Resetting race to %s from %s for archetype %s\n", race, &mon->clone.race, &mon->name);
1386 1351
1387 mon->clone.race = race; 1352 mon->clone.race = race;
1388 } 1353 }
1389 1354
1390 /* if the arch is a monster, add it to the race list */ 1355 /* if the arch is a monster, add it to the race list */

Diff Legend

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