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.64 by root, Tue Apr 22 23:50:24 2008 UTC vs.
Revision 1.79 by root, Sun Apr 11 00:34:06 2010 UTC

1/* 1/*
2 * This file is part of Deliantra, the Roguelike Realtime MMORPG. 2 * This file is part of Deliantra, the Roguelike Realtime MMORPG.
3 * 3 *
4 * Copyright (©) 2005,2006,2007,2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team 4 * Copyright (©) 2005,2006,2007,2008,2009,2010 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
5 * Copyright (©) 2002,2007 Mark Wedel & Crossfire Development Team 5 * Copyright (©) 2002 Mark Wedel & Crossfire Development Team
6 * Copyright (©) 1992,2007 Frank Tore Johansen 6 * Copyright (©) 1992 Frank Tore Johansen
7 * 7 *
8 * Deliantra is free software: you can redistribute it and/or modify 8 * Deliantra is free software: you can redistribute it and/or modify it under
9 * it under the terms of the GNU General Public License as published by 9 * the terms of the Affero GNU General Public License as published by the
10 * the Free Software Foundation, either version 3 of the License, or 10 * Free Software Foundation, either version 3 of the License, or (at your
11 * (at your option) any later version. 11 * 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 Affero GNU General Public License
19 * along with this program. If not, see <http://www.gnu.org/licenses/>. 19 * and the GNU General Public License along with this program. If not, see
20 * <http://www.gnu.org/licenses/>.
20 * 21 *
21 * The authors can be reached via e-mail to <support@deliantra.net> 22 * The authors can be reached via e-mail to <support@deliantra.net>
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 <sproto.h> 27#include <sproto.h>
28
29void
30set_logfile (char *val)
31{
32 settings.logfilename = val;
33}
34
35void
36call_version (void)
37{
38 version (NULL);
39 exit (0);
40}
41
42void
43showscores (void)
44{
45 display_high_score (NULL, 9999, NULL);
46 exit (0);
47}
48
49void
50set_debug (void)
51{
52 settings.debug = llevDebug;
53}
54
55void
56unset_debug (void)
57{
58 settings.debug = llevInfo;
59}
60
61void
62set_mondebug (void)
63{
64 settings.debug = llevMonster;
65}
66
67void
68set_dumpmon1 (void)
69{
70 settings.dumpvalues = 1;
71}
72
73void
74set_dumpmon2 (void)
75{
76 settings.dumpvalues = 2;
77}
78
79void
80set_dumpmon3 (void)
81{
82 settings.dumpvalues = 3;
83}
84
85void
86set_dumpmon4 (void)
87{
88 settings.dumpvalues = 4;
89}
90
91void
92set_dumpmon5 (void)
93{
94 settings.dumpvalues = 5;
95}
96
97void
98set_dumpmon6 (void)
99{
100 settings.dumpvalues = 6;
101}
102
103void
104set_dumpmon7 (void)
105{
106 settings.dumpvalues = 7;
107}
108
109void
110set_dumpmon8 (void)
111{
112 settings.dumpvalues = 8;
113}
114
115void
116set_dumpmon9 (void)
117{
118 settings.dumpvalues = 9;
119}
120
121void
122set_dumpmont (char *name)
123{
124 settings.dumpvalues = 10;
125 settings.dumparg = name;
126}
127
128void
129set_daemon (void)
130{
131 settings.daemonmode = 1;
132}
133
134void
135set_datadir (char *path)
136{
137 settings.datadir = path;
138}
139
140void
141set_confdir (char *path)
142{
143 settings.confdir = path;
144}
145
146void
147set_localdir (char *path)
148{
149 settings.localdir = path;
150}
151
152void
153set_mapdir (char *path)
154{
155 settings.mapdir = path;
156}
157
158void
159set_archetypes (char *path)
160{
161 settings.archetypes = path;
162}
163
164void
165set_regions (char *path)
166{
167 settings.regions = path;
168}
169
170void
171set_treasures (char *path)
172{
173 settings.treasures = path;
174}
175
176void
177set_uniquedir (char *path)
178{
179 settings.uniquedir = path;
180}
181
182void
183set_templatedir (char *path)
184{
185 settings.templatedir = path;
186}
187
188void
189set_playerdir (char *path)
190{
191 settings.playerdir = path;
192}
193
194void
195set_tmpdir (char *path)
196{
197 settings.tmpdir = path;
198}
199
200void
201showscoresparm (char *data)
202{
203 display_high_score (NULL, 9999, data);
204 exit (0);
205}
206
207void
208set_csport (char *val)
209{
210 settings.csport = atoi (val);
211 if (settings.csport <= 0 || settings.csport > 32765 || (settings.csport < 1024 && getuid () != 0))
212 {
213 LOG (llevError, "%d is an invalid csport number.\n", settings.csport);
214 exit (1);
215 }
216}
217
218/* Most of this is shamelessly stolen from XSysStats. But since that is
219 * also my program, no problem.
220 */
221struct Command_Line_Options
222{
223 const char *cmd_option; /* how it is called on the command line */
224 uint8 num_args; /* Number or args it takes */
225 uint8 pass; /* What pass this should be processed on. */
226 void (*func) (); /* function to call when we match this.
227 * if num_args is true, than that gets passed
228 * to the function, otherwise nothing is passed
229 */
230};
231
232/* The way this system works is pretty simple - parse_args takes
233 * the options passed to the program and a pass number. If an option
234 * matches both in name and in pass (and we have enough options),
235 * we call the associated function. This makes writing a multi
236 * pass system very easy, and it is very easy to add in new options.
237 */
238struct Command_Line_Options options[] = {
239
240/* Pass 1 functions - STuff that can/should be called before we actually
241 * initialise any data.
242 */
243 {"-h", 0, 1, help},
244
245/* Honor -help also, since it is somewhat common */
246 {"-help", 0, 1, help},
247 {"-v", 0, 1, call_version},
248 {"-d", 0, 1, set_debug},
249 {"+d", 0, 1, unset_debug},
250 {"-mon", 0, 1, set_mondebug},
251 {"-data", 1, 1, (void (*)()) set_datadir},
252 {"-conf", 1, 1, (void (*)()) set_confdir},
253 {"-local", 1, 1, (void (*)()) set_localdir},
254 {"-maps", 1, 1, (void (*)()) set_mapdir},
255 {"-arch", 1, 1, (void (*)()) set_archetypes},
256 {"-regions", 1, 1, (void (*)()) set_regions},
257 {"-playerdir", 1, 1, (void (*)()) set_playerdir},
258 {"-treasures", 1, 1, (void (*)()) set_treasures},
259 {"-uniquedir", 1, 1, (void (*)()) set_uniquedir},
260 {"-templatedir", 1, 1, (void (*)()) set_templatedir},
261 {"-tmpdir", 1, 1, (void (*)()) set_tmpdir},
262 {"-log", 1, 1, (void (*)()) set_logfile},
263
264/* Pass 2 functions. Most of these could probably be in pass 1,
265 * as they don't require much of anything to bet set up.
266 */
267 {"-csport", 1, 2, (void (*)()) set_csport},
268 {"-detach", 0, 2, set_daemon},
269
270/* Start of pass 3 information. In theory, by pass 3, all data paths
271 * and defaults should have been set up.
272 */
273 {"-m", 0, 3, set_dumpmon1},
274 {"-m2", 0, 3, set_dumpmon2},
275 {"-m3", 0, 3, set_dumpmon3},
276 {"-m4", 0, 3, set_dumpmon4},
277 {"-m5", 0, 3, set_dumpmon5},
278 {"-m6", 0, 3, set_dumpmon6},
279 {"-m7", 0, 3, set_dumpmon7},
280 {"-m8", 0, 3, set_dumpmon8},
281 {"-m9", 0, 3, set_dumpmon9},
282 {"-mt", 1, 3, (void (*)()) set_dumpmont},
283 {"-s", 0, 3, showscores},
284 {"-score", 1, 3, (void (*)()) showscoresparm}
285};
286
287
288/* Note since this may be called before the library has been set up,
289 * we don't use any of deliantras built in logging functions.
290 */
291static void
292parse_args (int argc, char *argv[], int pass)
293{
294 size_t i;
295 int on_arg = 1;
296
297 while (on_arg < argc)
298 {
299 for (i = 0; i < sizeof (options) / sizeof (struct Command_Line_Options); i++)
300 {
301 if (!strcmp (options[i].cmd_option, argv[on_arg]))
302 {
303 /* Found a matching option, but should not be processed on
304 * this pass. Just skip over it
305 */
306 if (options[i].pass != pass)
307 {
308 on_arg += options[i].num_args + 1;
309 break;
310 }
311 if (options[i].num_args)
312 {
313 if ((on_arg + options[i].num_args) >= argc)
314 {
315 fprintf (stderr, "%s requires an argument.\n", options[i].cmd_option);
316 exit (1);
317 }
318 else
319 {
320 if (options[i].num_args == 1)
321 ((void (*)(char *)) options[i].func) (argv[on_arg + 1]);
322 if (options[i].num_args == 2)
323 ((void (*)(char *, char *)) options[i].func) (argv[on_arg + 1], argv[on_arg + 2]);
324 on_arg += options[i].num_args + 1;
325 }
326 }
327 else
328 { /* takes no args */
329 options[i].func ();
330 on_arg++;
331 }
332 break;
333 }
334 }
335 if (i == sizeof (options) / sizeof (struct Command_Line_Options))
336 {
337 fprintf (stderr, "Unknown option: %s\n", argv[on_arg]);
338 usage ();
339 exit (1);
340 }
341 }
342}
343
344//TODO: make this a constructor
345static materialtype_t *
346get_empty_mat (void)
347{
348 materialtype_t *mt;
349 int i;
350
351 mt = new materialtype_t;
352
353 mt->name = NULL;
354 mt->description = NULL;
355 for (i = 0; i < NROFATTACKS; i++)
356 {
357 mt->save[i] = 0;
358 mt->mod[i] = 0;
359 }
360 mt->chance = 0;
361 mt->difficulty = 0;
362 mt->magic = 0;
363 mt->damage = 0;
364 mt->wc = 0;
365 mt->ac = 0;
366 mt->sp = 0;
367 mt->weight = 100;
368 mt->value = 100;
369 mt->next = NULL;
370 return mt;
371}
372
373static void
374load_materials (void)
375{
376 char filename[MAX_BUF];
377 materialtype_t *mt;
378
379 sprintf (filename, "%s/materials", settings.datadir);
380 LOG (llevDebug, "Reading material type data from %s...\n", filename);
381
382 object_thawer thawer (filename);
383
384 if (!thawer)
385 {
386 LOG (llevError, "Cannot open %s for reading\n", filename);
387 mt = get_empty_mat ();
388 mt->next = 0;
389 materialt = mt;
390 return;
391 }
392
393 mt = get_empty_mat ();
394 materialt = mt;
395
396 for (;;)
397 {
398 thawer.next ();
399
400 switch (thawer.kw)
401 {
402 case KW_name:
403 /* clean up the previous entry */
404 if (mt->next)
405 {
406 if (!mt->description)
407 mt->description = mt->name;
408
409 mt = mt->next;
410 }
411
412 mt->next = get_empty_mat ();
413 thawer.get (mt->name);
414 break;
415
416 case KW_description:
417 thawer.get (mt->description);
418 break;
419
420 case KW_material:
421 thawer.get (mt->material);
422 break;
423
424 case KW_saves:
425 {
426 const char *cp = thawer.get_str () - 1;
427
428 for (int i = 0; i < NROFATTACKS; i++)
429 {
430 if (!cp)
431 {
432 mt->save[i] = 0;
433 continue;
434 }
435
436 int value;
437 ++cp;
438 sscanf (cp, "%d", &value);
439 mt->save[i] = (sint8) value;
440 cp = strchr (cp, ',');
441 }
442 }
443 break;
444
445 case KW_mods:
446 {
447 const char *cp = thawer.get_str () - 1;
448
449 for (int i = 0; i < NROFATTACKS; i++)
450 {
451 if (!cp)
452 {
453 mt->save[i] = 0;
454 continue;
455 }
456
457 ++cp;
458 int value;
459 sscanf (cp, "%d", &value);
460 mt->mod[i] = (sint8) value;
461 cp = strchr (cp, ',');
462 }
463 }
464 break;
465
466 case KW_chance: thawer.get (mt->chance); break;
467 case KW_difficulty: // cf+ alias, not original cf
468 case KW_diff: thawer.get (mt->difficulty); break;
469 case KW_magic: thawer.get (mt->magic); break;
470 case KW_dam: // cf+ alias, not original cf
471 case KW_damage: thawer.get (mt->damage); break;
472 case KW_wc: thawer.get (mt->wc); break;
473 case KW_ac: thawer.get (mt->ac); break;
474 case KW_sp: thawer.get (mt->sp); break;
475 case KW_weight: thawer.get (mt->weight); break;
476 case KW_value: thawer.get (mt->value); break;
477 case KW_density: thawer.get (mt->density); break;
478
479 case KW_EOF:
480 goto done;
481
482 default:
483 if (!thawer.parse_error ("materials file", "materials"))
484 goto done;
485 break;
486 }
487 }
488
489done:
490 if (mt->next)
491 {
492 delete mt->next;
493
494 mt->next = 0;
495 }
496
497 LOG (llevDebug, "Done.\n");
498}
499 28
500/* This loads the settings file. There could be debate whether this should 29/* This loads the settings file. There could be debate whether this should
501 * be here or in the common directory - but since only the server needs this 30 * be here or in the common directory - but since only the server needs this
502 * information, having it here probably makes more sense. 31 * information, having it here probably makes more sense.
503 */ 32 */
504static void 33void
505load_settings (void) 34load_settings ()
506{ 35{
507 char buf[MAX_BUF], *cp; 36 char buf[MAX_BUF], *cp;
508 int has_val, comp; 37 int has_val, comp;
509 FILE *fp; 38 FILE *fp;
510 39
545 { 74 {
546 cp = (char *)""; 75 cp = (char *)"";
547 has_val = 0; 76 has_val = 0;
548 } 77 }
549 78
550 if (!strcasecmp (buf, "motd"))
551 {
552 if (has_val)
553 strcpy (settings.motd, cp);
554 else
555 LOG (llevError, "load_settings: motd must have a value.\n");
556 }
557 else if (!strcasecmp (buf, "dm_mail"))
558 {
559 if (has_val)
560 strcpy (settings.dm_mail, cp);
561 else
562 LOG (llevError, "load_settings: dm_mail must have a value.\n");
563 }
564 else if (!strcasecmp (buf, "worldmapstartx"))
565 {
566 int size = atoi (cp);
567
568 if (size < 0)
569 LOG (llevError, "load_settings: worldmapstartx must be at least " "0, %d is invalid\n", size);
570 else
571 settings.worldmapstartx = size;
572 }
573 else if (!strcasecmp (buf, "worldmapstarty"))
574 {
575 int size = atoi (cp);
576
577 if (size < 0)
578 LOG (llevError, "load_settings: worldmapstarty must be at least " "0, %d is invalid\n", size);
579 else
580 settings.worldmapstarty = size;
581 }
582 else if (!strcasecmp (buf, "worldmaptilesx"))
583 {
584 int size = atoi (cp);
585
586 if (size < 1)
587 LOG (llevError, "load_settings: worldmaptilesx must be greater " "than 1, %d is invalid\n", size);
588 else
589 settings.worldmaptilesx = size;
590 }
591 else if (!strcasecmp (buf, "worldmaptilesy"))
592 {
593 int size = atoi (cp);
594
595 if (size < 1)
596 LOG (llevError, "load_settings: worldmaptilesy must be greater " "than 1, %d is invalid\n", size);
597 else
598 settings.worldmaptilesy = size;
599 }
600 else if (!strcasecmp (buf, "worldmaptilesizex"))
601 {
602 int size = atoi (cp);
603
604 if (size < 1)
605 LOG (llevError, "load_settings: worldmaptilesizex must be " "greater than 1, %d is invalid\n", size);
606 else
607 settings.worldmaptilesizex = size;
608 }
609 else if (!strcasecmp (buf, "worldmaptilesizey"))
610 {
611 int size = atoi (cp);
612
613 if (size < 1)
614 LOG (llevError, "load_settings: worldmaptilesizey must be " "greater than 1, %d is invalid\n", size);
615 else
616 settings.worldmaptilesizey = size;
617 }
618 else if (!strcasecmp (buf, "dynamiclevel"))
619 {
620 int lev = atoi (cp);
621
622 if (lev < 0)
623 LOG (llevError, "load_settings: dynamiclevel must be " "at least 0, %d is invalid\n", lev);
624 else
625 settings.dynamiclevel = lev;
626 }
627 else if (!strcasecmp (buf, "fastclock"))
628 {
629 int lev = atoi (cp);
630
631 if (lev < 0)
632 LOG (llevError, "load_settings: fastclock must be at least 0" ", %d is invalid\n", lev);
633 else
634 settings.fastclock = lev;
635 }
636 else if (!strcasecmp (buf, "not_permadeth")) 79 if (!strcasecmp (buf, "not_permadeth"))
637 { 80 {
638 if (!strcasecmp (cp, "on") || !strcasecmp (cp, "true")) 81 if (!strcasecmp (cp, "on") || !strcasecmp (cp, "true"))
639 { 82 {
640 settings.not_permadeth = TRUE; 83 settings.not_permadeth = TRUE;
641 } 84 }
912 */ 355 */
913void 356void
914init (int argc, char **argv) 357init (int argc, char **argv)
915{ 358{
916 init_done = 0; /* Must be done before init_signal() */ 359 init_done = 0; /* Must be done before init_signal() */
917 rndm.seed (time (0));
918 360
919 init_environ (); 361 init_environ ();
920 parse_args (argc, argv, 1); /* First arg pass - right now it does
921 * nothing, but in future specifying the
922 * LibDir in this pass would be reasonable*/
923
924 init_anim (); // Must be called before perl
925 init_globals ();
926 init_experience ();
927 init_attackmess ();
928 init_dynamic ();
929 init_block ();
930 cfperl_init (); 362 cfperl_init ();
931 load_settings (); /* Load the settings file */
932 load_materials ();
933 parse_args (argc, argv, 2);
934 LOG (llevInfo, "Welcome to Deliantra, v" VERSION);
935 LOG (llevInfo, "Copyright (C) Marc Alexander Lehmann / Robin Redeker / the Deliantra team.");
936 LOG (llevInfo, "Copyright (C) 1994 Mark Wedel.");
937 LOG (llevInfo, "Copyright (C) 1992 Frank Tore Johansen.");
938
939 if (strcmp (settings.dm_mail, "") != 0)
940 {
941 LOG (llevInfo, "Maintained locally by: %s\n", settings.dm_mail);
942 LOG (llevInfo, "Questions and bugs should be mailed to above address.\n");
943 }
944
945 UUID::init ();
946 init_signals (); /* Sets up signal interceptions */
947 init_commands (); /* Sort command tables */
948 init_skills ();
949
950 parse_args (argc, argv, 3);
951
952 init_beforeplay ();
953 init_done = 1; 363 init_done = 1;
954} 364}
955 365
956void 366void
957usage (void) 367usage ()
958{ 368{
959 fprintf (stderr, "Usage: deliantra-server [-h] [-<flags>]...\n"); 369 fprintf (stderr, "Usage: deliantra-server [-h] [-<flags>]...\n");
960} 370}
961 371
962void 372void
963help (void) 373help ()
964{ 374{
965 375
966/* The information in usage is redundant with what is given below, so why call it? */ 376/* The information in usage is redundant with what is given below, so why call it? */
967 377
968/* usage();*/ 378/* usage();*/
1002 printf (" -m9 Dumps out more alchemy information (formula checking).\n"); 412 printf (" -m9 Dumps out more alchemy information (formula checking).\n");
1003 printf (" -mt <name> Dumps out list of treasures for a monster.\n"); 413 printf (" -mt <name> Dumps out list of treasures for a monster.\n");
1004 exit (0); 414 exit (0);
1005} 415}
1006 416
1007void
1008init_beforeplay (void)
1009{
1010 init_artifacts (); /* If not called before, reads all artifacts from file */
1011 init_races (); /* overwrite race designations using entries in lib/races file */
1012 init_gods (); /* init linked list of gods from archs */
1013 init_readable (); /* inits useful arrays for readable texts */
1014 init_formulae (); /* If not called before, reads formulae from file */
1015}
1016
1017/* Signal handlers: */ 417/* Signal handlers: */
1018 418
1019static void 419static void
1020rec_sigabrt (int i) 420rec_sigabrt (int i)
1021{ 421{
1062 signal (SIGINT , SIG_DFL); 462 signal (SIGINT , SIG_DFL);
1063 signal (SIGTERM, SIG_DFL); 463 signal (SIGTERM, SIG_DFL);
1064} 464}
1065 465
1066void 466void
1067init_signals (void) 467init_signals ()
1068{ 468{
1069 // large stack, but it's important data we want to save, and it is not usually 469 // large stack, but it's important data we want to save, and it is not usually
1070 // being physically allocated anyways 470 // being physically allocated anyways
1071 const size_t stacksize = 8 * 1024 * 1024 + SIGSTKSZ; 471 const size_t stacksize = 8 * 1024 * 1024 + SIGSTKSZ;
1072 472
1088 488
1089 sa.sa_flags |= SA_ONSTACK; 489 sa.sa_flags |= SA_ONSTACK;
1090 sa.sa_handler = rec_sigsegv; sigaction (SIGSEGV, &sa, 0); 490 sa.sa_handler = rec_sigsegv; sigaction (SIGSEGV, &sa, 0);
1091} 491}
1092 492
493static racelink *
494get_racelist ()
495{
496 racelink *list = new racelink;
497
498 list->name = 0;
499 list->nrof = 0;
500 list->next = 0;
501 list->member = get_objectlink ();
502
503 return list;
504}
505
506 racelink *
507find_racelink (const char *name)
508{
509 if (name)
510 for (racelink *link = first_race; link; link = link->next)
511 if (!link->name || !strcmp (name, link->name))
512 return link;
513
514 return 0;
515}
516
517static void
518add_to_racelist (const char *race_name, object *op)
519{
520 racelink *race;
521
522 if (!op || !race_name)
523 return;
524
525 race = find_racelink (race_name);
526
527 if (!race)
528 { /* add in a new race list */
529 race = get_racelist ();
530 race->next = first_race;
531 first_race = race;
532 race->name = race_name;
533 }
534
535 if (race->member->ob)
536 {
537 objectlink *tmp = get_objectlink ();
538
539 tmp->next = race->member;
540 race->member = tmp;
541 }
542
543 race->nrof++;
544 race->member->ob = op;
545}
546
1093/* init_races() - reads the races file in the lib/ directory, then 547/* init_races() - reads the races file in the lib/ directory, then
1094 * overwrites old 'race' entries. This routine allow us to quickly 548 * overwrites old 'race' entries. This routine allow us to quickly
1095 * re-configure the 'alignment' of monsters, objects. Useful for 549 * re-configure the 'alignment' of monsters, objects. Useful for
1096 * putting together lists of creatures, etc that belong to gods. 550 * putting together lists of creatures, etc that belong to gods.
1097 */ 551 */
1098void 552static void
1099init_races (void) 553init_races ()
1100{ 554{
1101 FILE *file; 555 FILE *file;
1102 char race[MAX_BUF], fname[MAX_BUF], buf[MAX_BUF], *cp, variable[MAX_BUF]; 556 char race[MAX_BUF], fname[MAX_BUF], buf[MAX_BUF], *cp, variable[MAX_BUF];
1103 archetype *mon = NULL; 557 archetype *mon = NULL;
1104 static int init_done = 0; 558 static int init_done = 0;
1127 *cp = '\0'; 581 *cp = '\0';
1128 582
1129 cp = buf; 583 cp = buf;
1130 while (*cp == ' ' || *cp == '!' || *cp == '@') 584 while (*cp == ' ' || *cp == '!' || *cp == '@')
1131 { 585 {
1132 if (*cp == '!') 586 if (*cp == '!') set_race = 0;
1133 set_race = 0;
1134 if (*cp == '@') 587 if (*cp == '@') set_list = 0;
1135 set_list = 0; 588
1136 cp++; 589 cp++;
1137 } 590 }
1138 591
1139 if (sscanf (cp, "RACE %s", variable)) 592 if (sscanf (cp, "RACE %s", variable))
1140 /* set new race value */ 593 /* set new race value */
1160 /* set creature race to race value */ 613 /* set creature race to race value */
1161 if ((mon = archetype::find (cp)) == NULL) 614 if ((mon = archetype::find (cp)) == NULL)
1162 LOG (llevError, "Creature %s in race file lacks archetype\n", cp); 615 LOG (llevError, "Creature %s in race file lacks archetype\n", cp);
1163 else 616 else
1164 { 617 {
1165 if (set_race && (!mon->race || strcmp (mon->race, race))) 618 if (set_race && (!mon->race || strcmp (&mon->race, race)))
1166 { 619 {
1167 if (mon->race) 620 if (mon->race)
1168 LOG (llevDebug, "Resetting race to %s from %s for archetype %s\n", race, &mon->race, &mon->archname); 621 LOG (llevDebug, "Resetting race to %s from %s for archetype %s\n", race, &mon->race, &mon->archname);
1169 622
1170 mon->race = race; 623 mon->race = race;
1171 } 624 }
1172 625
1173 /* if the arch is a monster, add it to the race list */ 626 /* if the arch is a monster, add it to the race list */
1174 if (set_list && QUERY_FLAG (mon, FLAG_MONSTER)) 627 if (set_list && mon->flag [FLAG_MONSTER])
1175 add_to_racelist (race, mon); 628 add_to_racelist (race, mon);
1176 } 629 }
1177 } 630 }
1178 } 631 }
1179 632
1180 fclose (file); 633 fclose (file);
1181 LOG (llevDebug, "done.\n"); 634 LOG (llevDebug, "done.\n");
1182} 635}
1183 636
1184void 637void
1185dump_races (void) 638init_beforeplay ()
1186{ 639{
1187 racelink *list; 640 init_artifacts (); /* If not called before, reads all artifacts from file */
1188 objectlink *tmp; 641 init_races (); /* overwrite race designations using entries in lib/races file */
1189 642 init_gods (); /* init linked list of gods from archs */
1190 for (list = first_race; list; list = list->next) 643 init_readable (); /* inits useful arrays for readable texts */
1191 { 644 init_formulae (); /* If not called before, reads formulae from file */
1192 fprintf (stderr, "\nRACE %s:\t", &list->name);
1193 for (tmp = list->member; tmp; tmp = tmp->next)
1194 fprintf (stderr, "%s(%d), ", &tmp->ob->arch->archname, tmp->ob->level);
1195 }
1196
1197 fprintf (stderr, "\n");
1198} 645}
1199 646
1200void
1201add_to_racelist (const char *race_name, object *op)
1202{
1203 racelink *race;
1204
1205 if (!op || !race_name)
1206 return;
1207
1208 race = find_racelink (race_name);
1209
1210 if (!race)
1211 { /* add in a new race list */
1212 race = get_racelist ();
1213 race->next = first_race;
1214 first_race = race;
1215 race->name = race_name;
1216 }
1217
1218 if (race->member->ob)
1219 {
1220 objectlink *tmp = get_objectlink ();
1221
1222 tmp->next = race->member;
1223 race->member = tmp;
1224 }
1225
1226 race->nrof++;
1227 race->member->ob = op;
1228}
1229
1230racelink *
1231get_racelist ()
1232{
1233 racelink *list = new racelink;
1234
1235 list->name = 0;
1236 list->nrof = 0;
1237 list->next = 0;
1238 list->member = get_objectlink ();
1239
1240 return list;
1241}
1242
1243racelink *
1244find_racelink (const char *name)
1245{
1246 if (name)
1247 for (racelink *link = first_race; link; link = link->next)
1248 if (!link->name || !strcmp (name, link->name))
1249 return link;
1250
1251 return 0;
1252}

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines