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.15 by root, Mon Oct 2 15:28:36 2006 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#ifndef __CEXTRACT__
28# include <sproto.h> 27#include <sproto.h>
29#endif
30
31/* global weathermap */
32weathermap_t **weathermap;
33 28
34void 29void
35set_logfile (char *val) 30set_logfile (char *val)
36{ 31{
37 settings.logfilename = val; 32 settings.logfilename = val;
… …
211 206
212void 207void
213set_csport (char *val) 208set_csport (char *val)
214{ 209{
215 settings.csport = atoi (val); 210 settings.csport = atoi (val);
216#ifndef WIN32 /* ***win32: set_csport: we remove csport error secure check here, do this later */
217 if (settings.csport <= 0 || settings.csport > 32765 || (settings.csport < 1024 && getuid () != 0)) 211 if (settings.csport <= 0 || settings.csport > 32765 || (settings.csport < 1024 && getuid () != 0))
218 { 212 {
219 LOG (llevError, "%d is an invalid csport number.\n", settings.csport); 213 LOG (llevError, "%d is an invalid csport number.\n", settings.csport);
220 exit (1); 214 exit (1);
221 } 215 }
222#endif /* win32 */
223} 216}
224 217
225/* Most of this is shamelessly stolen from XSysStats. But since that is 218/* Most of this is shamelessly stolen from XSysStats. But since that is
226 * also my program, no problem. 219 * also my program, no problem.
227 */ 220 */
… …
243 * pass system very easy, and it is very easy to add in new options. 236 * pass system very easy, and it is very easy to add in new options.
244 */ 237 */
245struct Command_Line_Options options[] = { 238struct Command_Line_Options options[] = {
246 239
247/* Pass 1 functions - STuff that can/should be called before we actually 240/* Pass 1 functions - STuff that can/should be called before we actually
248 * initialize any data. 241 * initialise any data.
249 */ 242 */
250 {"-h", 0, 1, help}, 243 {"-h", 0, 1, help},
251 244
252/* Honor -help also, since it is somewhat common */ 245/* Honor -help also, since it is somewhat common */
253 {"-help", 0, 1, help}, 246 {"-help", 0, 1, help},
… …
265 {"-treasures", 1, 1, (void (*)()) set_treasures}, 258 {"-treasures", 1, 1, (void (*)()) set_treasures},
266 {"-uniquedir", 1, 1, (void (*)()) set_uniquedir}, 259 {"-uniquedir", 1, 1, (void (*)()) set_uniquedir},
267 {"-templatedir", 1, 1, (void (*)()) set_templatedir}, 260 {"-templatedir", 1, 1, (void (*)()) set_templatedir},
268 {"-tmpdir", 1, 1, (void (*)()) set_tmpdir}, 261 {"-tmpdir", 1, 1, (void (*)()) set_tmpdir},
269 {"-log", 1, 1, (void (*)()) set_logfile}, 262 {"-log", 1, 1, (void (*)()) set_logfile},
270
271#ifdef WIN32
272
273/* Windows service stuff */
274 {"-regsrv", 0, 1, service_register},
275 {"-unregsrv", 0, 1, service_unregister},
276 {"-srv", 0, 1, service_handle},
277#endif
278 263
279/* Pass 2 functions. Most of these could probably be in pass 1, 264/* Pass 2 functions. Most of these could probably be in pass 1,
280 * as they don't require much of anything to bet set up. 265 * as they don't require much of anything to bet set up.
281 */ 266 */
282 {"-csport", 1, 2, (void (*)()) set_csport}, 267 {"-csport", 1, 2, (void (*)()) set_csport},
… …
388} 373}
389 374
390static void 375static void
391load_materials (void) 376load_materials (void)
392{ 377{
393 char buf[MAX_BUF], filename[MAX_BUF], *cp, *next; 378 char filename[MAX_BUF];
394 FILE *fp;
395 materialtype_t *mt; 379 materialtype_t *mt;
396 int i, value;
397 380
398 sprintf (filename, "%s/materials", settings.datadir); 381 sprintf (filename, "%s/materials", settings.datadir);
399 LOG (llevDebug, "Reading material type data from %s...", filename); 382 LOG (llevDebug, "Reading material type data from %s...\n", filename);
400 if ((fp = fopen (filename, "r")) == NULL) 383
384 object_thawer thawer (filename);
385
386 if (!thawer)
401 { 387 {
402 LOG (llevError, "Cannot open %s for reading\n", filename); 388 LOG (llevError, "Cannot open %s for reading\n", filename);
403 mt = get_empty_mat (); 389 mt = get_empty_mat ();
404 mt->next = NULL; 390 mt->next = 0;
405 materialt = mt; 391 materialt = mt;
406 return; 392 return;
407 } 393 }
394
408 mt = get_empty_mat (); 395 mt = get_empty_mat ();
409 materialt = mt; 396 materialt = mt;
410 while (fgets (buf, MAX_BUF, fp) != NULL) 397
398 for (;;)
411 { 399 {
412 if (*buf == '#') 400 thawer.next ();
413 continue; 401
414 if ((cp = strchr (buf, '\n')) != NULL) 402 switch (thawer.kw)
415 *cp = '\0';
416 cp = buf;
417 while (*cp == ' ') /* Skip blanks */
418 cp++;
419 if (!strncmp (cp, "name", 4))
420 { 403 {
404 case KW_name:
421 /* clean up the previous entry */ 405 /* clean up the previous entry */
422 if (mt->next != NULL) 406 if (mt->next)
423 { 407 {
424 if (mt->description == NULL) 408 if (!mt->description)
425 mt->description = mt->name; 409 mt->description = mt->name;
410
426 mt = mt->next; 411 mt = mt->next;
427 } 412 }
413
428 mt->next = get_empty_mat (); 414 mt->next = get_empty_mat ();
429 mt->name = strchr (cp, ' ') + 1; 415 thawer.get (mt->name);
430 } 416 break;
431 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:
432 { 427 {
433 mt->description = strchr (cp, ' ') + 1; 428 const char *cp = thawer.get_str () - 1;
434 } 429
435 else if (sscanf (cp, "material %d", &value))
436 {
437 mt->material = value;
438 }
439 else if (!strncmp (cp, "saves", 5))
440 {
441 cp = strchr (cp, ' ') + 1;
442 for (i = 0; i < NROFATTACKS; i++) 430 for (int i = 0; i < NROFATTACKS; i++)
443 {
444 if (cp == NULL)
445 { 431 {
432 if (!cp)
433 {
446 mt->save[i] = 0; 434 mt->save[i] = 0;
447 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, ',');
448 } 443 }
449 if ((next = strchr (cp, ',')) != NULL)
450 *(next++) = '\0';
451 sscanf (cp, "%d", &value);
452 mt->save[i] = (sint8) value;
453 cp = next;
454 }
455 }
456 else if (!strncmp (cp, "mods", 4))
457 {
458 cp = strchr (cp, ' ') + 1;
459 for (i = 0; i < NROFATTACKS; i++)
460 { 444 }
461 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++)
462 { 452 {
453 if (!cp)
454 {
463 mt->save[i] = 0; 455 mt->save[i] = 0;
464 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, ',');
465 } 464 }
466 if ((next = strchr (cp, ',')) != NULL)
467 *(next++) = '\0';
468 sscanf (cp, "%d", &value);
469 mt->mod[i] = (sint8) value;
470 cp = next;
471 }
472 } 465 }
473 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;
474 { 488 }
475 mt->chance = (sint8) value;
476 }
477 else if (sscanf (cp, "diff %d\n", &value))
478 {
479 mt->difficulty = (sint8) value;
480 }
481 else if (sscanf (cp, "magic %d\n", &value))
482 {
483 mt->magic = (sint8) value;
484 }
485 else if (sscanf (cp, "damage %d\n", &value))
486 {
487 mt->damage = (sint8) value;
488 }
489 else if (sscanf (cp, "wc %d\n", &value))
490 {
491 mt->wc = (sint8) value;
492 }
493 else if (sscanf (cp, "ac %d\n", &value))
494 {
495 mt->ac = (sint8) value;
496 }
497 else if (sscanf (cp, "sp %d\n", &value))
498 {
499 mt->sp = (sint8) value;
500 }
501 else if (sscanf (cp, "weight %d\n", &value))
502 {
503 mt->weight = value;
504 }
505 else if (sscanf (cp, "value %d\n", &value))
506 {
507 mt->value = value;
508 }
509 } 489 }
490
491done:
510 if (mt->next) 492 if (mt->next)
511 { 493 {
512 delete mt->next; 494 delete mt->next;
513 495
514 mt->next = NULL; 496 mt->next = 0;
515 } 497 }
498
516 LOG (llevDebug, "Done.\n"); 499 LOG (llevDebug, "Done.\n");
517 fclose (fp);
518} 500}
519 501
520/* 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
521 * 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
522 * information, having it here probably makes more sense. 504 * information, having it here probably makes more sense.
… …
532 514
533 /* 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,
534 * 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
535 * will not be a good thing. 517 * will not be a good thing.
536 */ 518 */
537 if ((fp = open_and_uncompress (buf, 0, &comp)) == NULL) 519 if (!(fp = open_and_uncompress (buf, 0, &comp)))
538 { 520 {
539 LOG (llevError, "Warning: No settings file found\n"); 521 LOG (llevError, "Error: No settings file found\n");
540 return; 522 exit (1);
541 } 523 }
524
542 while (fgets (buf, MAX_BUF - 1, fp) != NULL) 525 while (fgets (buf, MAX_BUF - 1, fp) != NULL)
543 { 526 {
544 if (buf[0] == '#') 527 if (buf[0] == '#')
545 continue; 528 continue;
546 /* eliminate newline */ 529 /* eliminate newline */
… …
560 *cp++ = 0; 543 *cp++ = 0;
561 has_val = 1; 544 has_val = 1;
562 } 545 }
563 else 546 else
564 { 547 {
565 cp = ""; 548 cp = (char *)"";
566 has_val = 0; 549 has_val = 0;
567 } 550 }
568 551
569 if (!strcasecmp (buf, "motd")) 552 if (!strcasecmp (buf, "motd"))
570 { 553 {
… …
740 else 723 else
741 { 724 {
742 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);
743 } 726 }
744 } 727 }
745 else if (!strcasecmp (buf, "casting_time"))
746 {
747 if (!strcasecmp (cp, "on") || !strcasecmp (cp, "true"))
748 {
749 settings.casting_time = TRUE;
750 }
751 else if (!strcasecmp (cp, "off") || !strcasecmp (cp, "false"))
752 {
753 settings.casting_time = FALSE;
754 }
755 else
756 {
757 LOG (llevError, "load_settings: Unknown value for " "casting_time: %s\n", cp);
758 }
759 }
760 else if (!strcasecmp (buf, "real_wiz"))
761 {
762 if (!strcasecmp (cp, "on") || !strcasecmp (cp, "true"))
763 {
764 settings.real_wiz = TRUE;
765 }
766 else if (!strcasecmp (cp, "off") || !strcasecmp (cp, "false"))
767 {
768 settings.real_wiz = FALSE;
769 }
770 else
771 {
772 LOG (llevError, "load_settings: Unknown value for " "real_wiz: %s\n", cp);
773 }
774 }
775 else if (!strcasecmp (buf, "recycle_tmp_maps"))
776 {
777 if (!strcasecmp (cp, "on") || !strcasecmp (cp, "true"))
778 {
779 settings.recycle_tmp_maps = TRUE;
780 }
781 else if (!strcasecmp (cp, "off") || !strcasecmp (cp, "false"))
782 {
783 settings.recycle_tmp_maps = FALSE;
784 }
785 else
786 {
787 LOG (llevError, "load_settings: Unknown value for " "recycle_tmp_maps: %s\n", cp);
788 }
789 }
790 else if (!strcasecmp (buf, "explore_mode"))
791 {
792 if (!strcasecmp (cp, "on") || !strcasecmp (cp, "true"))
793 {
794 settings.explore_mode = TRUE;
795 }
796 else if (!strcasecmp (cp, "off") || !strcasecmp (cp, "false"))
797 {
798 settings.explore_mode = FALSE;
799 }
800 else
801 {
802 LOG (llevError, "load_settings: Unknown value for " "explore_mode: %s\n", cp);
803 }
804 }
805 else if (!strcasecmp (buf, "who_format"))
806 {
807 if (has_val)
808 strcpy (settings.who_format, cp);
809 }
810 else if (!strcasecmp (buf, "who_wiz_format"))
811 {
812 if (has_val)
813 strcpy (settings.who_wiz_format, cp);
814 }
815 else if (!strcasecmp (buf, "spellpoint_level_depend")) 728 else if (!strcasecmp (buf, "spellpoint_level_depend"))
816 { 729 {
817 if (!strcasecmp (cp, "on") || !strcasecmp (cp, "true")) 730 if (!strcasecmp (cp, "on") || !strcasecmp (cp, "true"))
818 { 731 {
819 settings.spellpoint_level_depend = TRUE; 732 settings.spellpoint_level_depend = TRUE;
… …
923 } 836 }
924 else if (!strcasecmp (buf, "set_friendly_fire")) 837 else if (!strcasecmp (buf, "set_friendly_fire"))
925 { 838 {
926 int val = atoi (cp); 839 int val = atoi (cp);
927 840
928#if COZY_SERVER
929 if (val < 0 || val > 100) 841 if (val < 0 || val > 100)
930 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);
931#else
932 if (val < 1 || val > 100)
933 LOG (llevError, "load_settings: set_friendly_fire must be between 1 an 100" ", %d is invalid\n", val);
934#endif
935 else 843 else
936 settings.set_friendly_fire = val; 844 settings.set_friendly_fire = val;
937 } 845 }
938 else if (!strcasecmp (buf, "armor_max_enchant")) 846 else if (!strcasecmp (buf, "armor_max_enchant"))
939 { 847 {
… …
992 { 900 {
993 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);
994 } 902 }
995 903
996 } 904 }
997 else if (!strcasecmp (buf, "no_player_stealing"))
998 {
999 if (!strcasecmp (cp, "on") || !strcasecmp (cp, "true"))
1000 {
1001 settings.no_player_stealing = TRUE;
1002 }
1003 else if (!strcasecmp (cp, "off") || !strcasecmp (cp, "false"))
1004 {
1005 settings.no_player_stealing = FALSE;
1006 }
1007 else
1008 {
1009 LOG (llevError, "load_settings: unknown value for no_player_stealing: %s\n", cp);
1010 }
1011
1012 }
1013 else if (!strcasecmp (buf, "create_home_portals"))
1014 {
1015 if (!strcasecmp (cp, "on") || !strcasecmp (cp, "true"))
1016 {
1017 settings.create_home_portals = TRUE;
1018 }
1019 else if (!strcasecmp (cp, "off") || !strcasecmp (cp, "false"))
1020 {
1021 settings.create_home_portals = FALSE;
1022 }
1023 else
1024 {
1025 LOG (llevError, "load_settings: Unknown value for create_home_portals: %s\n", cp);
1026 }
1027
1028 }
1029 else 905 else
1030 {
1031 LOG (llevError, "Unknown value in settings file: %s\n", buf); 906 LOG (llevError, "Unknown value in settings file: %s\n", buf);
1032 }
1033 } 907 }
908
1034 close_and_delete (fp, comp); 909 close_and_delete (fp, comp);
1035} 910}
1036
1037 911
1038/* 912/*
1039 * init() is called only once, when starting the program. 913 * init() is called only once, when starting the program.
1040 */ 914 */
1041
1042void 915void
1043init (int argc, char **argv) 916init (int argc, char **argv)
1044{ 917{
1045 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
1046 logfile = stderr; 921 logfile = stderr;
922 init_environ ();
1047 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
1048 * nothing, but in future specifying the 924 * nothing, but in future specifying the
1049 * LibDir in this pass would be reasonable*/ 925 * LibDir in this pass would be reasonable*/
1050 926
927 init_anim (); // Must be called before perl
1051 cfperl_init (); 928 cfperl_init ();
1052 init_library (); /* Must be called early */ 929 init_library (); /* Must be called early */
1053 load_settings (); /* Load the settings file */ 930 load_settings (); /* Load the settings file */
1054 init_weather ();
1055 load_materials (); 931 load_materials ();
1056 parse_args (argc, argv, 2); 932 parse_args (argc, argv, 2);
1057 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");
1058 fprintf (logfile, "Copyright (C) 1994 Mark Wedel.\n"); 935 fprintf (logfile, "Copyright (C) 1994 Mark Wedel.\n");
1059 fprintf (logfile, "Copyright (C) 1992 Frank Tore Johansen.\n"); 936 fprintf (logfile, "Copyright (C) 1992 Frank Tore Johansen.\n");
1060 937
1061 if (strcmp (settings.dm_mail, "") != 0) 938 if (strcmp (settings.dm_mail, "") != 0)
1062 { 939 {
1063 fprintf (logfile, "Maintained locally by: %s\n", settings.dm_mail); 940 fprintf (logfile, "Maintained locally by: %s\n", settings.dm_mail);
1064 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");
1065 } 942 }
1066 943
1067 SRANDOM (time (NULL));
1068
1069 init_startup (); /* Write (C), check shutdown/forbid files */ 944 init_startup (); /* Write (C), check shutdown/forbid files */
1070 init_uuid (); 945 init_uuid ();
1071 init_signals (); /* Sets up signal interceptions */ 946 init_signals (); /* Sets up signal interceptions */
1072 init_commands (); /* Sort command tables */ 947 init_commands (); /* Sort command tables */
1073 read_map_log (); /* Load up the old temp map files */
1074 init_skills (); 948 init_skills ();
1075 949
1076 parse_args (argc, argv, 3); 950 parse_args (argc, argv, 3);
1077 951
1078#ifndef WIN32 /* ***win32: no BecomeDaemon in windows */
1079 if (settings.daemonmode)
1080 logfile = BecomeDaemon (settings.logfilename[0] == '\0' ? "logfile" : settings.logfilename);
1081#endif
1082
1083 init_beforeplay (); 952 init_beforeplay ();
1084 init_ericserver ();
1085 init_done = 1; 953 init_done = 1;
1086} 954}
1087 955
1088void 956void
1089usage (void) 957usage (void)
… …
1137} 1005}
1138 1006
1139void 1007void
1140init_beforeplay (void) 1008init_beforeplay (void)
1141{ 1009{
1142 init_archetypes (); /* If not called before, reads all archetypes from file */
1143 init_artifacts (); /* If not called before, reads all artifacts from file */ 1010 init_artifacts (); /* If not called before, reads all artifacts from file */
1144 init_spells (); /* If not called before, links archtypes used by spells */ 1011 init_spells (); /* If not called before, links archtypes used by spells */
1145 init_regions (); /* If not called before, reads all regions from file */
1146 init_archetype_pointers (); /* Setup global pointers to archetypes */ 1012 init_archetype_pointers (); /* Setup global pointers to archetypes */
1147 init_races (); /* overwrite race designations using entries in lib/races file */ 1013 init_races (); /* overwrite race designations using entries in lib/races file */
1148 init_gods (); /* init linked list of gods from archs */ 1014 init_gods (); /* init linked list of gods from archs */
1149 init_readable (); /* inits useful arrays for readable texts */ 1015 init_readable (); /* inits useful arrays for readable texts */
1150 init_formulae (); /* If not called before, reads formulae from file */ 1016 init_formulae (); /* If not called before, reads formulae from file */
1151
1152 switch (settings.dumpvalues)
1153 {
1154 case 1:
1155 print_monsters ();
1156 exit (0);
1157 case 2:
1158 dump_abilities ();
1159 exit (0);
1160 case 3:
1161 dump_artifacts ();
1162 exit (0);
1163 case 4:
1164 dump_spells ();
1165 exit (0);
1166 case 5:
1167 exit (0);
1168 case 6:
1169 dump_races ();
1170 exit (0);
1171 case 7:
1172 dump_alchemy ();
1173 exit (0);
1174 case 9:
1175 dump_alchemy_costs ();
1176 exit (0);
1177 case 10:
1178 dump_monster_treasure (settings.dumparg);
1179 exit (0);
1180 }
1181} 1017}
1182 1018
1183void 1019void
1184init_startup (void) 1020init_startup (void)
1185{ 1021{
… …
1250 printf ("Save player:\t<true>\n"); 1086 printf ("Save player:\t<true>\n");
1251 printf ("Save mode:\t%4.4o\n", SAVE_MODE); 1087 printf ("Save mode:\t%4.4o\n", SAVE_MODE);
1252 printf ("Playerdir:\t<VAR>/%s\n", settings.playerdir); 1088 printf ("Playerdir:\t<VAR>/%s\n", settings.playerdir);
1253 printf ("Itemsdir:\t<VAR>/%s\n", settings.uniquedir); 1089 printf ("Itemsdir:\t<VAR>/%s\n", settings.uniquedir);
1254 printf ("Tmpdir:\t\t%s\n", settings.tmpdir); 1090 printf ("Tmpdir:\t\t%s\n", settings.tmpdir);
1255 printf ("Map max timeout:\t%d\n", MAP_MAXTIMEOUT);
1256 printf ("Max objects:\t%d\n", MAX_OBJECTS);
1257#ifdef USE_CALLOC 1091#ifdef USE_CALLOC
1258 printf ("Use_calloc:\t<true>\n"); 1092 printf ("Use_calloc:\t<true>\n");
1259#else 1093#else
1260 printf ("Use_calloc:\t<false>\n"); 1094 printf ("Use_calloc:\t<false>\n");
1261#endif 1095#endif
… …
1264 printf ("Editor:\t\t%s\n", X_EDITOR); 1098 printf ("Editor:\t\t%s\n", X_EDITOR);
1265#endif 1099#endif
1266 1100
1267 printf ("Max_time:\t%d\n", MAX_TIME); 1101 printf ("Max_time:\t%d\n", MAX_TIME);
1268 1102
1269#ifdef WIN32 /* ***win32 compile_info(): remove execl... */
1270 printf ("Logfilename:\t%s\n", settings.logfilename);
1271 exit (0);
1272#else
1273 execl ("/bin/uname", "uname", "-a", NULL); 1103 execl ("/bin/uname", "uname", "-a", NULL);
1274 LOG (llevError, "Oops, shouldn't have gotten here: execl(/bin/uname) failed: %s\n", strerror (errno)); 1104 LOG (llevError, "Oops, shouldn't have gotten here: execl(/bin/uname) failed: %s\n", strerror (errno));
1275 exit (-1); 1105 exit (-1);
1276#endif
1277} 1106}
1278 1107
1279/* Signal handlers: */ 1108/* Signal handlers: */
1280 1109
1281void 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
1282rec_sigsegv (int i) 1120rec_sigsegv (int i)
1283{ 1121{
1122 signal (SIGSEGV, SIG_DFL);
1123
1284 LOG (llevError, "\nSIGSEGV received.\n"); 1124 LOG (llevError, "SIGSEGV received.\n");
1285 fatal_signal (1, 1); 1125 cleanup ("SIGSEGV received", 1);
1286} 1126}
1287 1127
1288void 1128static void
1289rec_sigint (int i)
1290{
1291 LOG (llevInfo, "\nSIGINT received.\n");
1292 fatal_signal (0, 1);
1293}
1294
1295void
1296rec_sighup (int i)
1297{
1298 LOG (llevInfo, "\nSIGHUP received\n");
1299 if (init_done)
1300 {
1301 emergency_save (0);
1302 cleanup ();
1303 }
1304 exit (0);
1305}
1306
1307void
1308rec_sigquit (int i) 1129rec_sigquit (int i)
1309{ 1130{
1131 signal (SIGQUIT, SIG_IGN);
1132
1310 LOG (llevInfo, "\nSIGQUIT received\n"); 1133 LOG (llevInfo, "SIGQUIT received\n");
1311 fatal_signal (1, 1); 1134 cleanup ("SIGQUIT received", 1);
1312} 1135}
1313 1136
1314void 1137static void
1315rec_sigbus (int i) 1138rec_sigbus (int i)
1316{ 1139{
1317#ifdef SIGBUS 1140 signal (SIGBUS, SIG_DFL);
1141
1318 LOG (llevError, "\nSIGBUS received\n"); 1142 LOG (llevError, "SIGBUS received\n");
1319 fatal_signal (1, 1); 1143 cleanup ("SIGBUS received", 1);
1320#endif
1321} 1144}
1322 1145
1323void 1146void
1324rec_sigterm (int i) 1147reset_signals ()
1325{ 1148{
1326 LOG (llevInfo, "\nSIGTERM received\n"); 1149 signal (SIGABRT, SIG_DFL);
1327 fatal_signal (0, 1); 1150 signal (SIGQUIT, SIG_DFL);
1328} 1151 signal (SIGSEGV, SIG_DFL);
1329 1152 signal (SIGBUS , SIG_DFL);
1330void 1153 signal (SIGINT , SIG_DFL);
1331fatal_signal (int make_core, int close_sockets) 1154 signal (SIGTERM, SIG_DFL);
1332{
1333 if (init_done)
1334 {
1335 emergency_save (0);
1336 clean_tmp_files ();
1337 }
1338 if (make_core)
1339 abort ();
1340 exit (0);
1341} 1155}
1342 1156
1343void 1157void
1344init_signals (void) 1158init_signals (void)
1345{ 1159{
1346#ifndef WIN32 /* init_signals() remove signals */ 1160 // large stack, but it's important data we want to save, and it is not usually
1347 signal (SIGHUP, rec_sighup); 1161 // being physically allocated anyways
1348 signal (SIGINT, rec_sigint); 1162 const size_t stacksize = 8 * 1024 * 1024 + SIGSTKSZ;
1349 signal (SIGQUIT, rec_sigquit); 1163
1350 signal (SIGSEGV, rec_sigsegv); 1164 stack_t ss;
1351 signal (SIGPIPE, SIG_IGN); 1165 ss.ss_sp = malloc (stacksize);
1352# ifdef SIGBUS 1166 ss.ss_flags = 0;
1353 signal (SIGBUS, rec_sigbus); 1167 ss.ss_size = stacksize;
1354# endif 1168 sigaltstack (&ss, 0);
1355 signal (SIGTERM, rec_sigterm); 1169
1356#endif 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);
1357} 1182}
1358 1183
1359/* init_races() - reads the races file in the lib/ directory, then 1184/* init_races() - reads the races file in the lib/ directory, then
1360 * overwrites old 'race' entries. This routine allow us to quickly 1185 * overwrites old 'race' entries. This routine allow us to quickly
1361 * re-configure the 'alignment' of monsters, objects. Useful for 1186 * re-configure the 'alignment' of monsters, objects. Useful for
1362 * putting together lists of creatures, etc that belong to gods. 1187 * putting together lists of creatures, etc that belong to gods.
1363 */ 1188 */
1364
1365void 1189void
1366init_races (void) 1190init_races (void)
1367{ 1191{
1368 FILE *file; 1192 FILE *file;
1369 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];
… …
1374 return; 1198 return;
1375 init_done = 1; 1199 init_done = 1;
1376 first_race = 0; 1200 first_race = 0;
1377 1201
1378 sprintf (fname, "%s/races", settings.datadir); 1202 sprintf (fname, "%s/races", settings.datadir);
1379 LOG (llevDebug, "Reading races from %s...", fname); 1203 LOG (llevDebug, "Reading races from %s...\n", fname);
1380 if (!(file = fopen (fname, "r"))) 1204 if (!(file = fopen (fname, "r")))
1381 { 1205 {
1382 LOG (llevError, "Cannot open races file %s: %s\n", fname, strerror (errno)); 1206 LOG (llevError, "Cannot open races file %s: %s\n", fname, strerror (errno));
1383 return; 1207 return;
1384 } 1208 }
… …
1402 set_list = 0; 1226 set_list = 0;
1403 cp++; 1227 cp++;
1404 } 1228 }
1405 1229
1406 if (sscanf (cp, "RACE %s", variable)) 1230 if (sscanf (cp, "RACE %s", variable))
1407 { /* set new race value */ 1231 /* set new race value */
1408 strcpy (race, variable); 1232 strcpy (race, variable);
1409 }
1410 else 1233 else
1411 { 1234 {
1412 char *cp1; 1235 char *cp1;
1413 1236
1414 /* Take out beginning spaces */ 1237 /* Take out beginning spaces */
… …
1425 if (cp[strlen (cp) - 1] == '\n') 1248 if (cp[strlen (cp) - 1] == '\n')
1426 cp[strlen (cp) - 1] = '\0'; 1249 cp[strlen (cp) - 1] = '\0';
1427 1250
1428 /* set creature race to race value */ 1251 /* set creature race to race value */
1429 if ((mon = archetype::find (cp)) == NULL) 1252 if ((mon = archetype::find (cp)) == NULL)
1430 LOG (llevError, "\nCreature %s in race file lacks archetype", cp); 1253 LOG (llevError, "Creature %s in race file lacks archetype\n", cp);
1431 else 1254 else
1432 { 1255 {
1433 if (set_race && (!mon->clone.race || strcmp (mon->clone.race, race))) 1256 if (set_race && (!mon->race || strcmp (mon->race, race)))
1434 { 1257 {
1435 if (mon->clone.race) 1258 if (mon->race)
1436 LOG (llevDebug, "\n Resetting race to %s from %s for archetype %s", race, &mon->clone.race, &mon->name); 1259 LOG (llevDebug, "Resetting race to %s from %s for archetype %s\n", race, &mon->race, &mon->archname);
1437 1260
1438 mon->clone.race = race; 1261 mon->race = race;
1439 } 1262 }
1440 1263
1441 /* 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 */
1442 if (set_list && QUERY_FLAG (&mon->clone, FLAG_MONSTER)) 1265 if (set_list && QUERY_FLAG (mon, FLAG_MONSTER))
1443 add_to_racelist (race, &mon->clone); 1266 add_to_racelist (race, mon);
1444 } 1267 }
1445 } 1268 }
1446 } 1269 }
1447 1270
1448 fclose (file); 1271 fclose (file);
… …
1457 1280
1458 for (list = first_race; list; list = list->next) 1281 for (list = first_race; list; list = list->next)
1459 { 1282 {
1460 fprintf (stderr, "\nRACE %s:\t", &list->name); 1283 fprintf (stderr, "\nRACE %s:\t", &list->name);
1461 for (tmp = list->member; tmp; tmp = tmp->next) 1284 for (tmp = list->member; tmp; tmp = tmp->next)
1462 fprintf (stderr, "%s(%d), ", &tmp->ob->arch->name, tmp->ob->level); 1285 fprintf (stderr, "%s(%d), ", &tmp->ob->arch->archname, tmp->ob->level);
1463 } 1286 }
1464 1287
1465 fprintf (stderr, "\n"); 1288 fprintf (stderr, "\n");
1466} 1289}
1467 1290

Diff Legend

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