ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/deliantra/server/common/arch.C
(Generate patch)

Comparing deliantra/server/common/arch.C (file contents):
Revision 1.23 by root, Thu Sep 14 23:13:48 2006 UTC vs.
Revision 1.47 by root, Mon Apr 16 10:14:25 2007 UTC

1/* 1/*
2 CrossFire, A Multiplayer game for X-windows 2 * CrossFire, A Multiplayer game for X-windows
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 <cassert> 25#include <cassert>
25 26
26#include <tr1/unordered_map>
27
28#include <global.h> 27#include <global.h>
29#include <arch.h>
30#include <funcpoint.h> 28#include <funcpoint.h>
31#include <loader.h> 29#include <loader.h>
32 30
33/* IF set, does a little timing on the archetype load. */ 31#include <tr1/functional>
34#define TIME_ARCH_LOAD 0 32#include <tr1/unordered_map>
35
36static void add_arch (archetype *at);
37
38static archetype *arch_table[ARCHTABLE];
39int arch_cmp = 0; /* How many strcmp's */
40int arch_search = 0; /* How many searches */
41int arch_init; /* True if doing arch initialization */
42 33
43/* The naming of these functions is really poor - they are all 34/* The naming of these functions is really poor - they are all
44 * pretty much named '.._arch_...', but they may more may not 35 * pretty much named '.._arch_...', but they may more may not
45 * return archetypes. Some make the arch_to_object call, and thus 36 * return archetypes. Some make the arch_to_object call, and thus
46 * return an object. Perhaps those should be called 'archob' functions 37 * return an object. Perhaps those should be called 'archob' functions
47 * to denote they return an object derived from the archetype. 38 * to denote they return an object derived from the archetype.
48 * MSW 2003-04-29 39 * MSW 2003-04-29
49 */ 40 */
50 41
51#if USE_UNORDERED_MAP 42bool loading_arch; // ugly flag to object laoder etc. to suppress/request special processing
43
52// the hashtable 44// the hashtable
53typedef std::tr1::unordered_map 45typedef std::tr1::unordered_map
54 < 46 <
55 std::size_t, 47 const char *,
56 archetype *, 48 arch_ptr,
57 std::hash<size_t>, 49 str_hash,
58 std::equal_to<size_t>, 50 str_equal,
59 slice_allocator< std::pair<const std::size_t, archetype *> > 51 slice_allocator< std::pair<const char *const, arch_ptr> >
60 true,
61 > HT; 52 > HT;
62 53
63static HT ht; 54static HT ht (5000);
64#endif 55static std::vector<archetype *> archetypes;
65 56
66/** 57/**
67 * GROS - This function retrieves an archetype given the name that appears 58 * GROS - This function retrieves an archetype given the name that appears
68 * during the game (for example, "writing pen" instead of "stylus"). 59 * during the game (for example, "writing pen" instead of "stylus").
69 * It does not use the hashtable system, but browse the whole archlist each time. 60 * It does not use the hashtable system, but browse the whole archlist each time.
… …
75 * - the archetype found or null if nothing was found. 66 * - the archetype found or null if nothing was found.
76 */ 67 */
77archetype * 68archetype *
78find_archetype_by_object_name (const char *name) 69find_archetype_by_object_name (const char *name)
79{ 70{
80 archetype *at; 71 shstr_cmp name_cmp (name);
81 72
82 if (name == NULL)
83 return (archetype *) NULL;
84
85 for (at = first_archetype; at != NULL; at = at->next) 73 for (archetype *at = first_archetype; at; at = at->next)
86 { 74 if (at->clone.name == name_cmp)
87 if (!strcmp (at->clone.name, name))
88 return at; 75 return at;
89 } 76
90 return NULL; 77 return 0;
91} 78}
92 79
93/** 80/**
94 * This function retrieves an archetype by type and name that appears during 81 * This function retrieves an archetype by type and name that appears during
95 * the game. It is basically the same as find_archetype_by_object_name() 82 * the game. It is basically the same as find_archetype_by_object_name()
96 * except that it considers only items of the given type. 83 * except that it considers only items of the given type.
97 */ 84 */
98archetype * 85archetype *
99find_archetype_by_object_type_name (int type, const char *name) 86find_archetype_by_object_type_name (int type, const char *name)
100{ 87{
101 archetype *at; 88 shstr_cmp name_cmp (name);
102 89
103 if (name == NULL)
104 return NULL;
105
106 for (at = first_archetype; at != NULL; at = at->next) 90 for (archetype *at = first_archetype; at; at = at->next)
107 { 91 if (at->clone.name == name_cmp && at->clone.type == type)
108 if (at->clone.type == type && strcmp (at->clone.name, name) == 0)
109 return at; 92 return at;
110 }
111 93
112 return NULL; 94 return 0;
113} 95}
114 96
115/* This is a lot like the above function. Instead, we are trying to match 97/* This is a lot like the above function. Instead, we are trying to match
116 * the arch->skill values. type is the type of object to match 98 * the arch->skill values. type is the type of object to match
117 * against (eg, to only match against skills or only skill objects for example). 99 * against (eg, to only match against skills or only skill objects for example).
118 * If type is -1, ew don't match on type. 100 * If type is -1, ew don't match on type.
119 */ 101 */
120object * 102object *
121get_archetype_by_skill_name (const char *skill, int type) 103get_archetype_by_skill_name (const char *skill, int type)
122{ 104{
123 archetype * 105 shstr_cmp skill_cmp (skill);
124 at;
125 106
126 if (skill == NULL)
127 return NULL;
128
129 for (at = first_archetype; at != NULL; at = at->next) 107 for (archetype *at = first_archetype; at; at = at->next)
130 { 108 if (at->clone.skill == skill_cmp && (type == -1 || type == at->clone.type))
131 if (((type == -1) || (type == at->clone.type)) && (!strcmp (at->clone.skill, skill)))
132 return arch_to_object (at); 109 return arch_to_object (at);
133 } 110
134 return NULL; 111 return 0;
135} 112}
136 113
137/* similiar to above - this returns the first archetype 114/* similiar to above - this returns the first archetype
138 * that matches both the type and subtype. type and subtype 115 * that matches both the type and subtype. type and subtype
139 * can be -1 to say ignore, but in this case, the match it does 116 * can be -1 to say ignore, but in this case, the match it does
… …
142 * (eg, skills) 119 * (eg, skills)
143 */ 120 */
144archetype * 121archetype *
145get_archetype_by_type_subtype (int type, int subtype) 122get_archetype_by_type_subtype (int type, int subtype)
146{ 123{
147 archetype *
148 at;
149
150 for (at = first_archetype; at != NULL; at = at->next) 124 for (archetype *at = first_archetype; at; at = at->next)
151 {
152 if (((type == -1) || (type == at->clone.type)) && (subtype == -1 || subtype == at->clone.subtype)) 125 if ((type == -1 || type == at->clone.type) && (subtype == -1 || subtype == at->clone.subtype))
153 return at; 126 return at;
154 } 127
155 return NULL; 128 return 0;
156} 129}
157 130
158/** 131/**
159 * GROS - this returns a new object given the name that appears during the game 132 * GROS - this returns a new object given the name that appears during the game
160 * (for example, "writing pen" instead of "stylus"). 133 * (for example, "writing pen" instead of "stylus").
… …
168 * but it otherwise had a big memory leak. 141 * but it otherwise had a big memory leak.
169 */ 142 */
170object * 143object *
171get_archetype_by_object_name (const char *name) 144get_archetype_by_object_name (const char *name)
172{ 145{
173 archetype *at;
174 char tmpname[MAX_BUF]; 146 char tmpname[MAX_BUF];
175 int i; 147 int i;
176 148
177 assign (tmpname, name); 149 assign (tmpname, name);
178 150
179 for (i = strlen (tmpname); i > 0; i--) 151 for (i = strlen (tmpname); i > 0; i--)
180 { 152 {
181 tmpname[i] = 0; 153 tmpname[i] = 0;
154
182 at = find_archetype_by_object_name (tmpname); 155 if (archetype *at = find_archetype_by_object_name (tmpname))
183
184 if (at != NULL)
185 return arch_to_object (at); 156 return arch_to_object (at);
186 } 157 }
187 158
188 return create_singularity (name); 159 return create_singularity (name);
189} 160}
… …
209item_matched_string (object *pl, object *op, const char *name) 180item_matched_string (object *pl, object *op, const char *name)
210{ 181{
211 char *cp, local_name[MAX_BUF]; 182 char *cp, local_name[MAX_BUF];
212 int count, retval = 0; 183 int count, retval = 0;
213 184
214 strcpy (local_name, name); /* strtok is destructive to name */ 185 assign (local_name, name); /* strtok is destructive to name */
215 186
216 for (cp = strtok (local_name, ","); cp; cp = strtok (NULL, ",")) 187 for (cp = strtok (local_name, ","); cp; cp = strtok (NULL, ","))
217 { 188 {
218 while (cp[0] == ' ') 189 while (cp[0] == ' ')
219 ++cp; /* get rid of spaces */ 190 ++cp; /* get rid of spaces */
… …
304 } 275 }
305 276
306 return 0; 277 return 0;
307} 278}
308 279
309/*
310 * Initialises the internal linked list of archetypes (read from file).
311 * Then the global "empty_archetype" pointer is initialised.
312 * Then the blocksview[] array is initialised.
313 */
314
315void 280void
316init_archetypes (void) 281init_archetypes (void)
317{ /* called from add_player() and edit() */ 282{
318 if (first_archetype != NULL) /* Only do this once */
319 return;
320
321 arch_init = 1;
322 load_archetypes (); 283 load_archetypes ();
323 arch_init = 0; 284
324 empty_archetype = archetype::find ("empty_archetype"); 285 empty_archetype = archetype::find ("empty_archetype");
325
326/* init_blocksview();*/
327} 286}
328 287
329/* 288archetype::archetype ()
330 * Stores debug-information about how efficient the hashtable 289{
331 * used for archetypes has been in the static errmsg array. 290 clone.arch = this;
332 */
333 291
292 CLEAR_FLAG (&clone, FLAG_FREED); /* This shouldn't matter, since copy_to */
293 SET_FLAG (&clone, FLAG_REMOVED); /* doesn't copy these flags... */
294}
295
296archetype::~archetype ()
297{
298 //TODO: nuke ->more's
299}
300
301static void
302unlink (archetype *at)
303{
304 if (at->head)
305 at = at->head;
306
307 // destroy this archetype's link, making singletons out of its parts
308 while (at)
309 {
310 archetype *more = at->more;
311 at->clone.destroy_inv ();
312 at->head = at->more = 0;
313 at = more;
314 }
315}
316
317// dire hack, need to rationalise
334void 318void
335arch_info (object *op) 319overwrite (archetype *at, object *op)
336{ 320{
337 sprintf (errmsg, "%d searches and %d strcmp()'s", arch_search, arch_cmp); 321 at->clone = *op;
338 new_draw_info (NDI_BLACK, 0, op, errmsg); 322
323 at->clone.arch = at;
324 //TODO: inv et al.
339} 325}
340 326
341/*
342 * Initialise the hashtable used by the archetypes.
343 */
344
345void
346clear_archetable (void)
347{
348 memset ((void *) arch_table, 0, ARCHTABLE * sizeof (archetype *));
349}
350
351/*
352 * An alternative way to init the hashtable which is slower, but _works_...
353 */
354
355void
356init_archetable (void)
357{
358 archetype *at; 327archetype *
359 328archetype::read (object_thawer &f)
360 LOG (llevDebug, " Setting up archetable...\n");
361
362 for (at = first_archetype; at != NULL; at = (at->more == NULL) ? at->next : at->more)
363 add_arch (at);
364
365 LOG (llevDebug, "done\n");
366}
367
368/*
369 * Dumps an archetype to debug-level output.
370 */
371
372void
373dump_arch (archetype *at)
374{ 329{
375 dump_object (&at->clone); 330 assert (f.kw == KW_object);
376}
377 331
378/* 332 archetype *head = get (f.get_str ());
379 * Dumps _all_ archetypes to debug-level output. 333 unlink (head);
380 * If you run crossfire with debug, and enter DM-mode, you can trigger 334 object *op = object::create ();
381 * this with the O key.
382 */
383 335
384void 336 if (!op->parse_kv (f))
385dump_all_archetypes (void)
386{
387 archetype *at;
388
389 for (at = first_archetype; at != NULL; at = (at->more == NULL) ? at->next : at->more)
390 {
391 dump_arch (at);
392 fprintf (logfile, "%s\n", errmsg);
393 } 337 {
394} 338 op->destroy (true);
395 339 // leak head
396void 340 return 0;
397free_all_archs (void)
398{
399 archetype *at, *next;
400 int i = 0, f = 0;
401
402 for (at = first_archetype; at != NULL; at = next)
403 { 341 }
404 if (at->more)
405 next = at->more;
406 else
407 next = at->next;
408 342
409 delete 343 overwrite (head, op);
410 at; 344 op->destroy ();
411 345
412 i++; 346 for (archetype *prev = head; f.kw == KW_more; )
413 } 347 {
414 LOG (llevDebug, "Freed %d archetypes, %d faces\n", i, f); 348 f.next ();
415} 349 assert (f.kw == KW_object);
416 350
417archetype::archetype () 351 archetype *more = get (f.get_str ());
418{ 352 unlink (more);
419 clear_object (&clone); /* to initial state other also */ 353 object *op = object::create ();
420 CLEAR_FLAG (&clone, FLAG_FREED); /* This shouldn't matter, since copy_object() */
421 SET_FLAG (&clone, FLAG_REMOVED); /* doesn't copy these flags... */
422}
423 354
424archetype::~archetype () 355 if (!op->parse_kv (f))
425{ 356 {
357 op->destroy (true);
358 // leak head more*
359 return 0;
360 }
361
362 overwrite (more, op);
363 op->destroy ();
364
365 if (more->clone.x > head->tail_x) head->tail_x = more->clone.x;
366 if (more->clone.y > head->tail_y) head->tail_y = more->clone.y;
367
368 more->head = head;
369 more->clone.head = &head->clone;
370 prev->more = more;
371 prev->clone.more = &more->clone;
372
373 prev = more;
374 }
375
376 if (!head->next)
377 {
378 head->next = first_archetype;
379 first_archetype = head;
380 }
381
382 return head;
426} 383}
427 384
428/* 385/*
429 * Reads/parses the archetype-file, and copies into a linked list 386 * Reads/parses the archetype-file, and copies into a linked list
430 * of archetype-structures. 387 * of archetype-structures.
431 */ 388 */
432void 389static bool
433first_arch_pass (object_thawer & fp) 390load_archetypes (object_thawer &f)
434{ 391{
435 archetype *at, *head = NULL, *last_more = NULL; 392 for (;;)
436
437 at->clone.arch = first_archetype = at = new archetype;
438
439 while (int i = load_object (fp, &at->clone, 0))
440 { 393 {
441 at->clone.speed_left = (float) (-0.1);
442 /* copy the body_info to the body_used - this is only really
443 * need for monsters, but doesn't hurt to do it for everything.
444 * by doing so, when a monster is created, it has good starting
445 * values for the body_used info, so when items are created
446 * for it, they can be properly equipped.
447 */
448 memcpy (&at->clone.body_used, &at->clone.body_info, sizeof (at->clone.body_info));
449
450 switch (i) 394 switch (f.kw)
451 { 395 {
452 case LL_NORMAL: /* A new archetype, just link it with the previous */ 396 case KW_object:
453 if (last_more != NULL) 397 loading_arch = true;
454 last_more->next = at; 398 if (!archetype::read (f))
455 if (head != NULL)
456 head->next = at;
457 head = last_more = at;
458#if 0
459 if (!op->type)
460 LOG (llevDebug, " WARNING: Archetype %s has no type info!\n", op->arch->name);
461#endif
462 at->tail_x = 0;
463 at->tail_y = 0;
464 break;
465
466 case LL_MORE: /* Another part of the previous archetype, link it correctly */
467
468 at->head = head;
469 at->clone.head = &head->clone;
470 if (last_more != NULL)
471 { 399 {
472 last_more->more = at; 400 loading_arch = false;
473 last_more->clone.more = &at->clone; 401 return false;
474 } 402 }
475 last_more = at;
476 403
477 /* If this multipart image is still composed of individual small 404 loading_arch = false;
478 * images, don't set the tail_.. values. We can't use them anyways, 405 continue;
479 * and setting these to zero makes the map sending to the client much 406
480 * easier as just looking at the head, we know what to do. 407 case KW_EOF:
481 */ 408 return true;
482 if (at->clone.face != head->clone.face) 409
483 { 410 default:
484 head->tail_x = 0; 411 if (!f.parse_error ("archetypes file"))
485 head->tail_y = 0;
486 }
487 else 412 return false;
488 {
489 if (at->clone.x > head->tail_x)
490 head->tail_x = at->clone.x;
491 if (at->clone.y > head->tail_y)
492 head->tail_y = at->clone.y;
493 }
494 break;
495
496 } 413 }
497 414
498 at = new archetype; 415 f.next ();
499
500 at->clone.arch = at;
501 }
502
503 delete at;
504}
505
506/*
507 * Reads the archetype file once more, and links all pointers between
508 * archetypes.
509 */
510
511void
512second_arch_pass (object_thawer & thawer)
513{
514 char buf[MAX_BUF], *variable = buf, *argument, *cp;
515 archetype *at = NULL, *other;
516
517 while (fgets (buf, MAX_BUF, thawer) != NULL)
518 { 416 }
519 if (*buf == '#')
520 continue;
521 if ((argument = strchr (buf, ' ')) != NULL)
522 {
523 *argument = '\0', argument++;
524 cp = argument + strlen (argument) - 1;
525 while (isspace (*cp))
526 {
527 *cp = '\0';
528 cp--;
529 }
530 }
531 if (!strcmp ("Object", variable))
532 {
533 if ((at = archetype::find (argument)) == NULL)
534 LOG (llevError, "Warning: failed to find arch %s\n", argument);
535 }
536 else if (!strcmp ("other_arch", variable))
537 {
538 if (at != NULL && at->clone.other_arch == NULL)
539 {
540 if ((other = archetype::find (argument)) == NULL)
541 LOG (llevError, "Warning: failed to find other_arch %s\n", argument);
542 else if (at != NULL)
543 at->clone.other_arch = other;
544 }
545 }
546 else if (!strcmp ("randomitems", variable))
547 {
548 if (at != NULL)
549 {
550 treasurelist *
551 tl = find_treasurelist (argument);
552
553 if (tl == NULL)
554 LOG (llevError, "Failed to link treasure to arch (%s): %s\n", &at->name, argument);
555 else
556 at->clone.randomitems = tl;
557 }
558 }
559 }
560} 417}
561
562#ifdef DEBUG
563void
564check_generators (void)
565{
566 archetype *at;
567
568 for (at = first_archetype; at != NULL; at = at->next)
569 if (QUERY_FLAG (&at->clone, FLAG_GENERATOR) && at->clone.other_arch == NULL)
570 LOG (llevError, "Warning: %s is generator but lacks other_arch.\n", &at->name);
571}
572#endif
573 418
574/* 419/*
575 * First initialises the archtype hash-table (init_archetable()). 420 * First initialises the archtype hash-table (init_archetable()).
576 * Reads and parses the archetype file (with the first and second-pass 421 * Reads and parses the archetype file (with the first and second-pass
577 * functions). 422 * functions).
578 * Then initialises treasures by calling load_treasures().
579 */ 423 */
580
581void 424void
582load_archetypes (void) 425load_archetypes (void)
583{ 426{
584 char filename[MAX_BUF]; 427 char filename[MAX_BUF];
585 428
586#if TIME_ARCH_LOAD
587 struct timeval
588 tv1,
589 tv2;
590#endif
591
592 sprintf (filename, "%s/%s", settings.datadir, settings.archetypes); 429 sprintf (filename, "%s/%s", settings.datadir, settings.archetypes);
593 LOG (llevDebug, "Reading archetypes from %s:\n", filename); 430 LOG (llevDebug, "Reading archetypes from %s:\n", filename);
594 431
595 {
596 object_thawer
597 thawer (filename); 432 object_thawer f (filename);
598 433
599 clear_archetable (); 434 f.next ();
600 LOG (llevDebug, " arch-pass 1...\n");
601 first_arch_pass (thawer);
602 LOG (llevDebug, " done\n");
603 }
604 435
605 init_archetable (); 436 if (!load_archetypes (f))
437 cleanup ("unable to load archetypes");
438
606 warn_archetypes = 1; 439 warn_archetypes = 1;
607 440
608 {
609 object_thawer
610 thawer (filename);
611
612 LOG (llevDebug, " loading treasure...\n");
613 load_treasures (); 441 load_treasures ();
614 LOG (llevDebug, " done\n arch-pass 2...\n");
615 second_arch_pass (thawer);
616 LOG (llevDebug, " done\n");
617#ifdef DEBUG
618 check_generators ();
619#endif
620 }
621 LOG (llevDebug, " done\n");
622} 442}
623 443
624/* 444/*
625 * Creates and returns a new object which is a copy of the given archetype. 445 * Creates and returns a new object which is a copy of the given archetype.
626 * This function returns NULL on failure. 446 * This function returns NULL on failure.
627 */ 447 */
628
629object * 448object *
630arch_to_object (archetype *at) 449arch_to_object (archetype *at)
631{ 450{
632 object *op; 451 if (!at)
633
634 if (at == NULL)
635 { 452 {
636 if (warn_archetypes) 453 if (warn_archetypes)
637 LOG (llevError, "Couldn't find archetype.\n"); 454 LOG (llevError, "Couldn't find archetype.\n");
638 455
639 return NULL; 456 return NULL;
640 } 457 }
641 458
642 op = get_object (); 459 object *op = at->clone.clone ();
643 copy_object (&at->clone, op);
644 op->arch = at; 460 op->arch = at;
645 op->instantiate (); 461 op->instantiate ();
646 return op; 462 return op;
647} 463}
648 464
… …
650 * Creates an object. This function is called by get_archetype() 466 * Creates an object. This function is called by get_archetype()
651 * if it fails to find the appropriate archetype. 467 * if it fails to find the appropriate archetype.
652 * Thus get_archetype() will be guaranteed to always return 468 * Thus get_archetype() will be guaranteed to always return
653 * an object, and never NULL. 469 * an object, and never NULL.
654 */ 470 */
655
656object * 471object *
657create_singularity (const char *name) 472create_singularity (const char *name)
658{ 473{
659 object *op; 474 object *op;
660 char buf[MAX_BUF]; 475 char buf[MAX_BUF];
661 476
662 sprintf (buf, "%s (%s)", ARCH_SINGULARITY, name); 477 sprintf (buf, "%s (%s)", ARCH_SINGULARITY, name);
663 op = get_object (); 478 op = object::create ();
664 op->name = op->name_pl = buf; 479 op->name = op->name_pl = buf;
665 SET_FLAG (op, FLAG_NO_PICK); 480 SET_FLAG (op, FLAG_NO_PICK);
666 return op; 481 return op;
667} 482}
668 483
669/* 484/*
670 * Finds which archetype matches the given name, and returns a new 485 * Finds which archetype matches the given name, and returns a new
671 * object containing a copy of the archetype. 486 * object containing a copy of the archetype.
672 */ 487 */
673
674object * 488object *
675get_archetype (const char *name) 489get_archetype (const char *name)
676{ 490{
677 archetype *at = archetype::find (name); 491 archetype *at = archetype::find (name);
678 492
… …
714 528
715/* 529/*
716 * Finds, using the hashtable, which archetype matches the given name. 530 * Finds, using the hashtable, which archetype matches the given name.
717 * returns a pointer to the found archetype, otherwise NULL. 531 * returns a pointer to the found archetype, otherwise NULL.
718 */ 532 */
719
720archetype * 533archetype *
721archetype::find (const char *name) 534archetype::find (const char *name)
722{ 535{
723 if (!name) 536 if (!name)
724 return 0; 537 return 0;
725 538
726#if USE_UNORDERED_MAP
727 AUTODECL (i, ht.find ((size_t) name)); 539 AUTODECL (i, ht.find (name));
728 540
729 if (i == ht.end ()) 541 if (i == ht.end ())
730 return 0; 542 return 0;
731 else 543 else
732 return i->second; 544 return i->second;
733#endif 545}
734 546
735 archetype *at; 547archetype *
736 unsigned long index; 548archetype::get (const char *name)
549{
550 archetype *at = find (name);
737 551
738 index = hasharch (name, ARCHTABLE); 552 if (!at)
739 arch_search++;
740 for (;;)
741 {
742 at = arch_table[index];
743
744 if (at == NULL)
745 {
746 if (warn_archetypes)
747 LOG (llevError, "Couldn't find archetype %s\n", name);
748
749 return NULL;
750 }
751
752 arch_cmp++;
753
754 if (!strcmp ((const char *) at->name, name))
755 return at;
756
757 if (++index >= ARCHTABLE)
758 index = 0;
759 } 553 {
554 archetypes.push_back (at = new archetype);
555 at->name = name;
556 at->hash_add ();
557 }
558
559 return at;
760} 560}
761 561
762/* 562/*
763 * Adds an archetype to the hashtable. 563 * Adds an archetype to the hashtable.
764 */ 564 */
765 565void
766static void 566archetype::hash_add ()
767add_arch (archetype *at)
768{ 567{
769#if USE_UNORDERED_MAP 568 ht.insert (std::make_pair (name, this));
770 ht.insert (std::make_pair ((size_t) (const char *) at->name, at)); 569}
771#endif
772 570
773 int index = hasharch ((const char *) at->name, ARCHTABLE), org_index = index; 571void
774 572archetype::hash_del ()
775 for (;;) 573{
776 { 574 ht.erase (name);
777 if (arch_table[index] == NULL)
778 {
779 arch_table[index] = at;
780 return;
781 }
782
783 if (++index == ARCHTABLE)
784 index = 0;
785
786 if (index == org_index)
787 fatal (ARCHTABLE_TOO_SMALL);
788 }
789} 575}
790 576
791/* 577/*
792 * Returns the first archetype using the given type. 578 * Returns the first archetype using the given type.
793 * Used in treasure-generation. 579 * Used in treasure-generation.
794 */ 580 */
795
796archetype * 581archetype *
797type_to_archetype (int type) 582type_to_archetype (int type)
798{ 583{
799 archetype *at;
800
801 for (at = first_archetype; at; at = at->more == 0 ? at->next : at->more) 584 for (archetype *at = first_archetype; at; at = at->more == 0 ? at->next : at->more)
802 if (at->clone.type == type) 585 if (at->clone.type == type)
803 return at; 586 return at;
804 587
805 return 0; 588 return 0;
806} 589}
… …
808/* 591/*
809 * Returns a new object copied from the first archetype matching 592 * Returns a new object copied from the first archetype matching
810 * the given type. 593 * the given type.
811 * Used in treasure-generation. 594 * Used in treasure-generation.
812 */ 595 */
813
814object * 596object *
815clone_arch (int type) 597clone_arch (int type)
816{ 598{
817 archetype *at; 599 archetype *at;
818 object *op = get_object ();
819 600
820 if ((at = type_to_archetype (type)) == NULL) 601 if ((at = type_to_archetype (type)) == NULL)
821 { 602 {
822 LOG (llevError, "Can't clone archetype %d\n", type); 603 LOG (llevError, "Can't clone archetype %d\n", type);
823 free_object (op);
824 return NULL; 604 return 0;
825 } 605 }
826 606
827 copy_object (&at->clone, op); 607 object *op = at->clone.clone ();
828 op->instantiate (); 608 op->instantiate ();
829 return op; 609 return op;
830} 610}
831 611
832/* 612/*

Diff Legend

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