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.61 by root, Thu Apr 10 15:35:16 2008 UTC vs.
Revision 1.74 by root, Fri Nov 6 12:27:06 2009 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 Marc Alexander Lehmann / Robin Redeker / the Deliantra team 4 * Copyright (©) 2005,2006,2007,2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
5 * Copyright (©) 2002,2007 Mark Wedel & Crossfire Development Team 5 * Copyright (©) 2002,2007 Mark Wedel & Crossfire Development Team
6 * Copyright (©) 1992,2007 Frank Tore Johansen 6 * Copyright (©) 1992,2007 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 <loader.h>
27#include <sproto.h> 28#include <sproto.h>
28 29
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 {"-mexp", 0, 3, dump_experience},
284 {"-s", 0, 3, showscores},
285 {"-score", 1, 3, (void (*)()) showscoresparm}
286};
287
288
289/* Note since this may be called before the library has been set up,
290 * we don't use any of deliantras built in logging functions.
291 */
292static void
293parse_args (int argc, char *argv[], int pass)
294{
295 size_t i;
296 int on_arg = 1;
297
298 while (on_arg < argc)
299 {
300 for (i = 0; i < sizeof (options) / sizeof (struct Command_Line_Options); i++)
301 {
302 if (!strcmp (options[i].cmd_option, argv[on_arg]))
303 {
304 /* Found a matching option, but should not be processed on
305 * this pass. Just skip over it
306 */
307 if (options[i].pass != pass)
308 {
309 on_arg += options[i].num_args + 1;
310 break;
311 }
312 if (options[i].num_args)
313 {
314 if ((on_arg + options[i].num_args) >= argc)
315 {
316 fprintf (stderr, "%s requires an argument.\n", options[i].cmd_option);
317 exit (1);
318 }
319 else
320 {
321 if (options[i].num_args == 1)
322 ((void (*)(char *)) options[i].func) (argv[on_arg + 1]);
323 if (options[i].num_args == 2)
324 ((void (*)(char *, char *)) options[i].func) (argv[on_arg + 1], argv[on_arg + 2]);
325 on_arg += options[i].num_args + 1;
326 }
327 }
328 else
329 { /* takes no args */
330 options[i].func ();
331 on_arg++;
332 }
333 break;
334 }
335 }
336 if (i == sizeof (options) / sizeof (struct Command_Line_Options))
337 {
338 fprintf (stderr, "Unknown option: %s\n", argv[on_arg]);
339 usage ();
340 exit (1);
341 }
342 }
343}
344
345//TODO: make this a constructor
346static materialtype_t *
347get_empty_mat (void)
348{
349 materialtype_t *mt;
350 int i;
351
352 mt = new materialtype_t;
353
354 mt->name = NULL;
355 mt->description = NULL;
356 for (i = 0; i < NROFATTACKS; i++)
357 {
358 mt->save[i] = 0;
359 mt->mod[i] = 0;
360 }
361 mt->chance = 0;
362 mt->difficulty = 0;
363 mt->magic = 0;
364 mt->damage = 0;
365 mt->wc = 0;
366 mt->ac = 0;
367 mt->sp = 0;
368 mt->weight = 100;
369 mt->value = 100;
370 mt->next = NULL;
371 return mt;
372}
373
374static void
375load_materials (void)
376{
377 char filename[MAX_BUF];
378 materialtype_t *mt;
379
380 sprintf (filename, "%s/materials", settings.datadir);
381 LOG (llevDebug, "Reading material type data from %s...\n", filename);
382
383 object_thawer thawer (filename);
384
385 if (!thawer)
386 {
387 LOG (llevError, "Cannot open %s for reading\n", filename);
388 mt = get_empty_mat ();
389 mt->next = 0;
390 materialt = mt;
391 return;
392 }
393
394 mt = get_empty_mat ();
395 materialt = mt;
396
397 for (;;)
398 {
399 thawer.next ();
400
401 switch (thawer.kw)
402 {
403 case KW_name:
404 /* clean up the previous entry */
405 if (mt->next)
406 {
407 if (!mt->description)
408 mt->description = mt->name;
409
410 mt = mt->next;
411 }
412
413 mt->next = get_empty_mat ();
414 thawer.get (mt->name);
415 break;
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:
426 {
427 const char *cp = thawer.get_str () - 1;
428
429 for (int i = 0; i < NROFATTACKS; i++)
430 {
431 if (!cp)
432 {
433 mt->save[i] = 0;
434 continue;
435 }
436
437 int value;
438 ++cp;
439 sscanf (cp, "%d", &value);
440 mt->save[i] = (sint8) value;
441 cp = strchr (cp, ',');
442 }
443 }
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++)
451 {
452 if (!cp)
453 {
454 mt->save[i] = 0;
455 continue;
456 }
457
458 ++cp;
459 int value;
460 sscanf (cp, "%d", &value);
461 mt->mod[i] = (sint8) value;
462 cp = strchr (cp, ',');
463 }
464 }
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;
487 }
488 }
489
490done:
491 if (mt->next)
492 {
493 delete mt->next;
494
495 mt->next = 0;
496 }
497
498 LOG (llevDebug, "Done.\n");
499}
500
501/* This loads the settings file. There could be debate whether this should 30/* This loads the settings file. There could be debate whether this should
502 * be here or in the common directory - but since only the server needs this 31 * be here or in the common directory - but since only the server needs this
503 * information, having it here probably makes more sense. 32 * information, having it here probably makes more sense.
504 */ 33 */
505static void 34void
506load_settings (void) 35load_settings (void)
507{ 36{
508 char buf[MAX_BUF], *cp; 37 char buf[MAX_BUF], *cp;
509 int has_val, comp; 38 int has_val, comp;
510 FILE *fp; 39 FILE *fp;
… …
546 { 75 {
547 cp = (char *)""; 76 cp = (char *)"";
548 has_val = 0; 77 has_val = 0;
549 } 78 }
550 79
551 if (!strcasecmp (buf, "motd"))
552 {
553 if (has_val)
554 strcpy (settings.motd, cp);
555 else
556 LOG (llevError, "load_settings: motd must have a value.\n");
557 }
558 else if (!strcasecmp (buf, "dm_mail"))
559 {
560 if (has_val)
561 strcpy (settings.dm_mail, cp);
562 else
563 LOG (llevError, "load_settings: dm_mail must have a value.\n");
564 }
565 else if (!strcasecmp (buf, "worldmapstartx"))
566 {
567 int size = atoi (cp);
568
569 if (size < 0)
570 LOG (llevError, "load_settings: worldmapstartx must be at least " "0, %d is invalid\n", size);
571 else
572 settings.worldmapstartx = size;
573 }
574 else if (!strcasecmp (buf, "worldmapstarty"))
575 {
576 int size = atoi (cp);
577
578 if (size < 0)
579 LOG (llevError, "load_settings: worldmapstarty must be at least " "0, %d is invalid\n", size);
580 else
581 settings.worldmapstarty = size;
582 }
583 else if (!strcasecmp (buf, "worldmaptilesx"))
584 {
585 int size = atoi (cp);
586
587 if (size < 1)
588 LOG (llevError, "load_settings: worldmaptilesx must be greater " "than 1, %d is invalid\n", size);
589 else
590 settings.worldmaptilesx = size;
591 }
592 else if (!strcasecmp (buf, "worldmaptilesy"))
593 {
594 int size = atoi (cp);
595
596 if (size < 1)
597 LOG (llevError, "load_settings: worldmaptilesy must be greater " "than 1, %d is invalid\n", size);
598 else
599 settings.worldmaptilesy = size;
600 }
601 else if (!strcasecmp (buf, "worldmaptilesizex"))
602 {
603 int size = atoi (cp);
604
605 if (size < 1)
606 LOG (llevError, "load_settings: worldmaptilesizex must be " "greater than 1, %d is invalid\n", size);
607 else
608 settings.worldmaptilesizex = size;
609 }
610 else if (!strcasecmp (buf, "worldmaptilesizey"))
611 {
612 int size = atoi (cp);
613
614 if (size < 1)
615 LOG (llevError, "load_settings: worldmaptilesizey must be " "greater than 1, %d is invalid\n", size);
616 else
617 settings.worldmaptilesizey = size;
618 }
619 else if (!strcasecmp (buf, "dynamiclevel"))
620 {
621 int lev = atoi (cp);
622
623 if (lev < 0)
624 LOG (llevError, "load_settings: dynamiclevel must be " "at least 0, %d is invalid\n", lev);
625 else
626 settings.dynamiclevel = lev;
627 }
628 else if (!strcasecmp (buf, "fastclock"))
629 {
630 int lev = atoi (cp);
631
632 if (lev < 0)
633 LOG (llevError, "load_settings: fastclock must be at least 0" ", %d is invalid\n", lev);
634 else
635 settings.fastclock = lev;
636 }
637 else if (!strcasecmp (buf, "not_permadeth")) 80 if (!strcasecmp (buf, "not_permadeth"))
638 { 81 {
639 if (!strcasecmp (cp, "on") || !strcasecmp (cp, "true")) 82 if (!strcasecmp (cp, "on") || !strcasecmp (cp, "true"))
640 { 83 {
641 settings.not_permadeth = TRUE; 84 settings.not_permadeth = TRUE;
642 } 85 }
… …
913 */ 356 */
914void 357void
915init (int argc, char **argv) 358init (int argc, char **argv)
916{ 359{
917 init_done = 0; /* Must be done before init_signal() */ 360 init_done = 0; /* Must be done before init_signal() */
918 rndm.seed (time (0));
919 361
920 logfile = stderr;
921 init_environ (); 362 init_environ ();
922 parse_args (argc, argv, 1); /* First arg pass - right now it does
923 * nothing, but in future specifying the
924 * LibDir in this pass would be reasonable*/
925
926 init_anim (); // Must be called before perl
927 init_globals ();
928 init_experience ();
929 init_attackmess ();
930 init_dynamic ();
931 init_block ();
932 cfperl_init (); 363 cfperl_init ();
933 load_settings (); /* Load the settings file */
934 load_materials ();
935 parse_args (argc, argv, 2);
936 fprintf (logfile, "Welcome to Deliantra, v%s\n", VERSION);
937 fprintf (logfile, "Copyright (C) 2005, 2006, 2007 Marc Lehmann.\n");
938 fprintf (logfile, "Copyright (C) 1994 Mark Wedel.\n");
939 fprintf (logfile, "Copyright (C) 1992 Frank Tore Johansen.\n");
940
941 if (strcmp (settings.dm_mail, "") != 0)
942 {
943 fprintf (logfile, "Maintained locally by: %s\n", settings.dm_mail);
944 fprintf (logfile, "Questions and bugs should be mailed to above address.\n");
945 }
946
947 UUID::init ();
948 init_signals (); /* Sets up signal interceptions */
949 init_commands (); /* Sort command tables */
950 init_skills ();
951
952 parse_args (argc, argv, 3);
953
954 init_beforeplay ();
955 init_done = 1; 364 init_done = 1;
956} 365}
957 366
958void 367void
959usage (void) 368usage (void)
960{ 369{
961 (void) fprintf (logfile, "Usage: deliantra-server [-h] [-<flags>]...\n"); 370 fprintf (stderr, "Usage: deliantra-server [-h] [-<flags>]...\n");
962} 371}
963 372
964void 373void
965help (void) 374help (void)
966{ 375{
… …
1004 printf (" -m9 Dumps out more alchemy information (formula checking).\n"); 413 printf (" -m9 Dumps out more alchemy information (formula checking).\n");
1005 printf (" -mt <name> Dumps out list of treasures for a monster.\n"); 414 printf (" -mt <name> Dumps out list of treasures for a monster.\n");
1006 exit (0); 415 exit (0);
1007} 416}
1008 417
1009void
1010init_beforeplay (void)
1011{
1012 init_artifacts (); /* If not called before, reads all artifacts from file */
1013 init_spells (); /* If not called before, links archtypes used by spells */
1014 init_archetype_pointers (); /* Setup global pointers to archetypes */
1015 init_races (); /* overwrite race designations using entries in lib/races file */
1016 init_gods (); /* init linked list of gods from archs */
1017 init_readable (); /* inits useful arrays for readable texts */
1018 init_formulae (); /* If not called before, reads formulae from file */
1019}
1020
1021/* Signal handlers: */ 418/* Signal handlers: */
1022 419
1023static void 420static void
1024rec_sigabrt (int i) 421rec_sigabrt (int i)
1025{ 422{
… …
1092 489
1093 sa.sa_flags |= SA_ONSTACK; 490 sa.sa_flags |= SA_ONSTACK;
1094 sa.sa_handler = rec_sigsegv; sigaction (SIGSEGV, &sa, 0); 491 sa.sa_handler = rec_sigsegv; sigaction (SIGSEGV, &sa, 0);
1095} 492}
1096 493
494static racelink *
495get_racelist ()
496{
497 racelink *list = new racelink;
498
499 list->name = 0;
500 list->nrof = 0;
501 list->next = 0;
502 list->member = get_objectlink ();
503
504 return list;
505}
506
507 racelink *
508find_racelink (const char *name)
509{
510 if (name)
511 for (racelink *link = first_race; link; link = link->next)
512 if (!link->name || !strcmp (name, link->name))
513 return link;
514
515 return 0;
516}
517
518static void
519add_to_racelist (const char *race_name, object *op)
520{
521 racelink *race;
522
523 if (!op || !race_name)
524 return;
525
526 race = find_racelink (race_name);
527
528 if (!race)
529 { /* add in a new race list */
530 race = get_racelist ();
531 race->next = first_race;
532 first_race = race;
533 race->name = race_name;
534 }
535
536 if (race->member->ob)
537 {
538 objectlink *tmp = get_objectlink ();
539
540 tmp->next = race->member;
541 race->member = tmp;
542 }
543
544 race->nrof++;
545 race->member->ob = op;
546}
547
1097/* init_races() - reads the races file in the lib/ directory, then 548/* init_races() - reads the races file in the lib/ directory, then
1098 * overwrites old 'race' entries. This routine allow us to quickly 549 * overwrites old 'race' entries. This routine allow us to quickly
1099 * re-configure the 'alignment' of monsters, objects. Useful for 550 * re-configure the 'alignment' of monsters, objects. Useful for
1100 * putting together lists of creatures, etc that belong to gods. 551 * putting together lists of creatures, etc that belong to gods.
1101 */ 552 */
1102void 553static void
1103init_races (void) 554init_races (void)
1104{ 555{
1105 FILE *file; 556 FILE *file;
1106 char race[MAX_BUF], fname[MAX_BUF], buf[MAX_BUF], *cp, variable[MAX_BUF]; 557 char race[MAX_BUF], fname[MAX_BUF], buf[MAX_BUF], *cp, variable[MAX_BUF];
1107 archetype *mon = NULL; 558 archetype *mon = NULL;
… …
1131 *cp = '\0'; 582 *cp = '\0';
1132 583
1133 cp = buf; 584 cp = buf;
1134 while (*cp == ' ' || *cp == '!' || *cp == '@') 585 while (*cp == ' ' || *cp == '!' || *cp == '@')
1135 { 586 {
1136 if (*cp == '!') 587 if (*cp == '!') set_race = 0;
1137 set_race = 0;
1138 if (*cp == '@') 588 if (*cp == '@') set_list = 0;
1139 set_list = 0; 589
1140 cp++; 590 cp++;
1141 } 591 }
1142 592
1143 if (sscanf (cp, "RACE %s", variable)) 593 if (sscanf (cp, "RACE %s", variable))
1144 /* set new race value */ 594 /* set new race value */
… …
1164 /* set creature race to race value */ 614 /* set creature race to race value */
1165 if ((mon = archetype::find (cp)) == NULL) 615 if ((mon = archetype::find (cp)) == NULL)
1166 LOG (llevError, "Creature %s in race file lacks archetype\n", cp); 616 LOG (llevError, "Creature %s in race file lacks archetype\n", cp);
1167 else 617 else
1168 { 618 {
1169 if (set_race && (!mon->race || strcmp (mon->race, race))) 619 if (set_race && (!mon->race || strcmp (&mon->race, race)))
1170 { 620 {
1171 if (mon->race) 621 if (mon->race)
1172 LOG (llevDebug, "Resetting race to %s from %s for archetype %s\n", race, &mon->race, &mon->archname); 622 LOG (llevDebug, "Resetting race to %s from %s for archetype %s\n", race, &mon->race, &mon->archname);
1173 623
1174 mon->race = race; 624 mon->race = race;
… …
1183 633
1184 fclose (file); 634 fclose (file);
1185 LOG (llevDebug, "done.\n"); 635 LOG (llevDebug, "done.\n");
1186} 636}
1187 637
1188void 638static void
1189dump_races (void) 639dump_races (void)
1190{ 640{
1191 racelink *list; 641 racelink *list;
1192 objectlink *tmp; 642 objectlink *tmp;
1193 643
… …
1200 650
1201 fprintf (stderr, "\n"); 651 fprintf (stderr, "\n");
1202} 652}
1203 653
1204void 654void
1205add_to_racelist (const char *race_name, object *op) 655init_beforeplay (void)
1206{ 656{
1207 racelink *race; 657 init_artifacts (); /* If not called before, reads all artifacts from file */
1208 658 init_races (); /* overwrite race designations using entries in lib/races file */
1209 if (!op || !race_name) 659 init_gods (); /* init linked list of gods from archs */
1210 return; 660 init_readable (); /* inits useful arrays for readable texts */
1211 661 init_formulae (); /* If not called before, reads formulae from file */
1212 race = find_racelink (race_name);
1213
1214 if (!race)
1215 { /* add in a new race list */
1216 race = get_racelist ();
1217 race->next = first_race;
1218 first_race = race;
1219 race->name = race_name;
1220 }
1221
1222 if (race->member->ob)
1223 {
1224 objectlink *tmp = get_objectlink ();
1225
1226 tmp->next = race->member;
1227 race->member = tmp;
1228 }
1229
1230 race->nrof++;
1231 race->member->ob = op;
1232} 662}
1233 663
1234racelink *
1235get_racelist ()
1236{
1237 racelink *list = new racelink;
1238
1239 list->name = 0;
1240 list->nrof = 0;
1241 list->next = 0;
1242 list->member = get_objectlink ();
1243
1244 return list;
1245}
1246
1247racelink *
1248find_racelink (const char *name)
1249{
1250 if (name)
1251 for (racelink *link = first_race; link; link = link->next)
1252 if (!link->name || !strcmp (name, link->name))
1253 return link;
1254
1255 return 0;
1256}

Diff Legend

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