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.25 by root, Tue Nov 7 16:30:54 2006 UTC vs.
Revision 1.31 by root, Wed Dec 13 03:28:42 2006 UTC

… …
21 The authors can be reached via e-mail at <crossfire@schmorp.de> 21 The authors can be reached via e-mail at <crossfire@schmorp.de>
22*/ 22*/
23 23
24#include <cassert> 24#include <cassert>
25 25
26#include <tr1/unordered_map>
27
28#include <global.h> 26#include <global.h>
29#include <arch.h>
30#include <funcpoint.h> 27#include <funcpoint.h>
31#include <loader.h> 28#include <loader.h>
32 29
33/* IF set, does a little timing on the archetype load. */ 30#define USE_UNORDERED_MAP 0
34#define TIME_ARCH_LOAD 0
35 31
36static void add_arch (archetype *at); 32#if USE_UNORDERED_MAP
33# include <tr1/functional>
34# include <tr1/unordered_map>
35#endif
37 36
38static archetype *arch_table[ARCHTABLE];
39int arch_cmp = 0; /* How many strcmp's */ 37int arch_cmp = 0; /* How many strcmp's */
40int arch_search = 0; /* How many searches */ 38int arch_search = 0; /* How many searches */
41int arch_init; /* True if doing arch initialization */ 39int arch_init; /* True if doing arch initialization */
42 40
43/* The naming of these functions is really poor - they are all 41/* The naming of these functions is really poor - they are all
… …
51#if USE_UNORDERED_MAP 49#if USE_UNORDERED_MAP
52// the hashtable 50// the hashtable
53typedef std::tr1::unordered_map 51typedef std::tr1::unordered_map
54 < 52 <
55 std::size_t, 53 std::size_t,
56 archetype *, 54 arch_ptr,
57 std::hash<size_t>, 55 std::tr1::hash<size_t>,
58 std::equal_to<size_t>, 56 std::equal_to<size_t>,
59 slice_allocator< std::pair<const std::size_t, archetype *> > 57 slice_allocator< std::pair<const std::size_t, archetype *> >
60 true, 58 true,
61 > HT; 59 > HT;
62 60
63static HT ht; 61static HT ht;
62#else
63static arch_ptr arch_table[ARCHTABLE];
64#endif 64#endif
65 65
66/** 66/**
67 * GROS - This function retrieves an archetype given the name that appears 67 * GROS - This function retrieves an archetype given the name that appears
68 * during the game (for example, "writing pen" instead of "stylus"). 68 * during the game (for example, "writing pen" instead of "stylus").
… …
358 archetype *at; 358 archetype *at;
359 359
360 LOG (llevDebug, " Setting up archetable...\n"); 360 LOG (llevDebug, " Setting up archetable...\n");
361 361
362 for (at = first_archetype; at != NULL; at = (at->more == NULL) ? at->next : at->more) 362 for (at = first_archetype; at != NULL; at = (at->more == NULL) ? at->next : at->more)
363 add_arch (at); 363 at->hash_add ();
364 364
365 LOG (llevDebug, "done\n"); 365 LOG (llevDebug, "done\n");
366} 366}
367 367
368void 368void
… …
381 delete 381 delete
382 at; 382 at;
383 383
384 i++; 384 i++;
385 } 385 }
386
386 LOG (llevDebug, "Freed %d archetypes, %d faces\n", i, f); 387 LOG (llevDebug, "Freed %d archetypes, %d faces\n", i, f);
387} 388}
388 389
389archetype::archetype () 390archetype::archetype ()
390{ 391{
391 clear_object (&clone); /* to initial state other also */ 392 clone.clear (); /* to initial state other also */
392 CLEAR_FLAG (&clone, FLAG_FREED); /* This shouldn't matter, since copy_object() */ 393 CLEAR_FLAG (&clone, FLAG_FREED); /* This shouldn't matter, since copy_to */
393 SET_FLAG (&clone, FLAG_REMOVED); /* doesn't copy these flags... */ 394 SET_FLAG (&clone, FLAG_REMOVED); /* doesn't copy these flags... */
394} 395}
395 396
396archetype::~archetype () 397archetype::~archetype ()
397{ 398{
… …
402 * of archetype-structures. 403 * of archetype-structures.
403 */ 404 */
404void 405void
405first_arch_pass (object_thawer & fp) 406first_arch_pass (object_thawer & fp)
406{ 407{
407 archetype *at, *head = NULL, *last_more = NULL; 408 archetype *head = 0, *last_more = 0;
408 409
410 archetype *at = new archetype;
409 at->clone.arch = first_archetype = at = new archetype; 411 at->clone.arch = first_archetype = at;
410 412
411 while (int i = load_object (fp, &at->clone, 0)) 413 while (int i = load_object (fp, &at->clone, 0))
412 { 414 {
413 at->clone.speed_left = (float) (-0.1); 415 at->clone.speed_left = (float) (-0.1);
414 /* copy the body_info to the body_used - this is only really 416 /* copy the body_info to the body_used - this is only really
… …
552void 554void
553load_archetypes (void) 555load_archetypes (void)
554{ 556{
555 char filename[MAX_BUF]; 557 char filename[MAX_BUF];
556 558
557#if TIME_ARCH_LOAD
558 struct timeval
559 tv1,
560 tv2;
561#endif
562
563 sprintf (filename, "%s/%s", settings.datadir, settings.archetypes); 559 sprintf (filename, "%s/%s", settings.datadir, settings.archetypes);
564 LOG (llevDebug, "Reading archetypes from %s:\n", filename); 560 LOG (llevDebug, "Reading archetypes from %s:\n", filename);
565 561
566 { 562 {
567 object_thawer 563 object_thawer
… …
608 LOG (llevError, "Couldn't find archetype.\n"); 604 LOG (llevError, "Couldn't find archetype.\n");
609 605
610 return NULL; 606 return NULL;
611 } 607 }
612 608
613 op = get_object (); 609 op = at->clone.clone ();
614 copy_object (&at->clone, op);
615 op->arch = at; 610 op->arch = at;
616 op->instantiate (); 611 op->instantiate ();
617 return op; 612 return op;
618} 613}
619 614
… …
629{ 624{
630 object *op; 625 object *op;
631 char buf[MAX_BUF]; 626 char buf[MAX_BUF];
632 627
633 sprintf (buf, "%s (%s)", ARCH_SINGULARITY, name); 628 sprintf (buf, "%s (%s)", ARCH_SINGULARITY, name);
634 op = get_object (); 629 op = object::create ();
635 op->name = op->name_pl = buf; 630 op->name = op->name_pl = buf;
636 SET_FLAG (op, FLAG_NO_PICK); 631 SET_FLAG (op, FLAG_NO_PICK);
637 return op; 632 return op;
638} 633}
639 634
… …
731} 726}
732 727
733/* 728/*
734 * Adds an archetype to the hashtable. 729 * Adds an archetype to the hashtable.
735 */ 730 */
736 731void
737static void 732archetype::hash_add ()
738add_arch (archetype *at)
739{ 733{
740#if USE_UNORDERED_MAP 734#if USE_UNORDERED_MAP
741 ht.insert (std::make_pair ((size_t) (const char *) at->name, at)); 735 ht.insert (std::make_pair ((size_t) (const char *) name, this));
742#endif 736#else
743 737
744 int index = hasharch ((const char *) at->name, ARCHTABLE), org_index = index; 738 int index = hasharch ((const char *) name, ARCHTABLE), org_index = index;
745 739
746 for (;;) 740 for (;;)
747 { 741 {
748 if (arch_table[index] == NULL) 742 if (!arch_table[index])
749 { 743 {
750 arch_table[index] = at; 744 arch_table[index] = this;
751 return; 745 break;
752 } 746 }
753 747
754 if (++index == ARCHTABLE) 748 if (++index == ARCHTABLE)
755 index = 0; 749 index = 0;
756 750
757 if (index == org_index) 751 if (index == org_index)
758 fatal (ARCHTABLE_TOO_SMALL); 752 fatal (ARCHTABLE_TOO_SMALL);
759 } 753 }
754#endif
755}
756
757void
758archetype::hash_del ()
759{
760#if USE_UNORDERED_MAP
761# error remove this from HT
762#else
763
764 int index = hasharch ((const char *) name, ARCHTABLE), org_index = index;
765
766 for (;;)
767 {
768 if (arch_table[index] == this)
769 {
770 arch_table[index] = 0;
771 break;
772 }
773
774 if (++index == ARCHTABLE)
775 index = 0;
776
777 if (index == org_index)
778 break;
779 }
780#endif
760} 781}
761 782
762/* 783/*
763 * Returns the first archetype using the given type. 784 * Returns the first archetype using the given type.
764 * Used in treasure-generation. 785 * Used in treasure-generation.
… …
784 805
785object * 806object *
786clone_arch (int type) 807clone_arch (int type)
787{ 808{
788 archetype *at; 809 archetype *at;
789 object *op = get_object ();
790 810
791 if ((at = type_to_archetype (type)) == NULL) 811 if ((at = type_to_archetype (type)) == NULL)
792 { 812 {
793 LOG (llevError, "Can't clone archetype %d\n", type); 813 LOG (llevError, "Can't clone archetype %d\n", type);
794 free_object (op);
795 return NULL; 814 return 0;
796 } 815 }
797 816
798 copy_object (&at->clone, op); 817 object *op = at->clone.clone ();
799 op->instantiate (); 818 op->instantiate ();
800 return op; 819 return op;
801} 820}
802 821
803/* 822/*

Diff Legend

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