| … | |
… | |
| 50 | str_equal, |
50 | str_equal, |
| 51 | slice_allocator< std::pair<const char *const, arch_ptr> > |
51 | slice_allocator< std::pair<const char *const, arch_ptr> > |
| 52 | > HT; |
52 | > HT; |
| 53 | |
53 | |
| 54 | static HT ht (5000); |
54 | static HT ht (5000); |
| 55 | static std::vector<archetype *> archetypes; |
55 | archvec archetypes; |
| 56 | |
56 | |
| 57 | /** |
57 | /** |
| 58 | * GROS - This function retrieves an archetype given the name that appears |
58 | * GROS - This function retrieves an archetype given the name that appears |
| 59 | * during the game (for example, "writing pen" instead of "stylus"). |
59 | * during the game (for example, "writing pen" instead of "stylus"). |
| 60 | * 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. |
| … | |
… | |
| 377 | { |
377 | { |
| 378 | archetype *at = p->first; |
378 | archetype *at = p->first; |
| 379 | |
379 | |
| 380 | if (at->head != head && at->head) |
380 | if (at->head != head && at->head) |
| 381 | { |
381 | { |
| 382 | LOG (llevError, "%s: unable to overwrite foreign non-head archetype with non-head archetype\n", &at->name); |
382 | LOG (llevError, "%s: unable to overwrite foreign non-head archetype with non-head archetype\n", &at->archname); |
| 383 | goto fail; |
383 | goto fail; |
| 384 | } |
384 | } |
| 385 | |
385 | |
| 386 | if (at->next && at != head) |
386 | if (at->next && at != head) |
| 387 | { |
387 | { |
| 388 | LOG (llevError, "%s: unable to overwrite foreign head archetype with non-head archetype\n", &at->name); |
388 | LOG (llevError, "%s: unable to overwrite foreign head archetype with non-head archetype\n", &at->archname); |
| 389 | goto fail; |
389 | goto fail; |
| 390 | } |
390 | } |
| 391 | } |
391 | } |
| 392 | |
392 | |
| 393 | // sever chain of existing head object |
393 | // sever chain of existing head object |
| … | |
… | |
| 538 | |
538 | |
| 539 | archetype *at = find (name); |
539 | archetype *at = find (name); |
| 540 | |
540 | |
| 541 | if (!at) |
541 | if (!at) |
| 542 | { |
542 | { |
| 543 | archetypes.push_back (at = new archetype); |
543 | archetypes.insert (at = new archetype); |
| 544 | at->name = at->clone.name = at->clone.name_pl = name; |
544 | at->archname = at->clone.name = at->clone.name_pl = name; |
| 545 | at->hash_add (); |
545 | at->hash_add (); |
| 546 | } |
546 | } |
| 547 | |
547 | |
| 548 | return at; |
548 | return at; |
| 549 | } |
549 | } |
| … | |
… | |
| 552 | * Adds an archetype to the hashtable. |
552 | * Adds an archetype to the hashtable. |
| 553 | */ |
553 | */ |
| 554 | void |
554 | void |
| 555 | archetype::hash_add () |
555 | archetype::hash_add () |
| 556 | { |
556 | { |
| 557 | ht.insert (std::make_pair (name, this)); |
557 | ht.insert (std::make_pair (archname, this)); |
| 558 | } |
558 | } |
| 559 | |
559 | |
| 560 | void |
560 | void |
| 561 | archetype::hash_del () |
561 | archetype::hash_del () |
| 562 | { |
562 | { |
| 563 | ht.erase (name); |
563 | ht.erase (archname); |
| 564 | } |
564 | } |
| 565 | |
565 | |
| 566 | /* |
566 | /* |
| 567 | * Returns the first archetype using the given type. |
567 | * Returns the first archetype using the given type. |
| 568 | * Used in treasure-generation. |
568 | * Used in treasure-generation. |
