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.36 by pippijn, Sat Jan 6 14:42:28 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
… …
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#define USE_UNORDERED_MAP 0
34#define TIME_ARCH_LOAD 0
35 32
36static void add_arch (archetype *at); 33#if USE_UNORDERED_MAP
34# include <tr1/functional>
35# include <tr1/unordered_map>
36#endif
37 37
38static archetype *arch_table[ARCHTABLE];
39int arch_cmp = 0; /* How many strcmp's */ 38int arch_cmp = 0; /* How many strcmp's */
40int arch_search = 0; /* How many searches */ 39int arch_search = 0; /* How many searches */
41int arch_init; /* True if doing arch initialization */ 40int arch_init; /* True if doing arch initialization */
42 41
43/* The naming of these functions is really poor - they are all 42/* The naming of these functions is really poor - they are all
… …
51#if USE_UNORDERED_MAP 50#if USE_UNORDERED_MAP
52// the hashtable 51// the hashtable
53typedef std::tr1::unordered_map 52typedef std::tr1::unordered_map
54 < 53 <
55 std::size_t, 54 std::size_t,
56 archetype *, 55 arch_ptr,
57 std::hash<size_t>, 56 std::tr1::hash<size_t>,
58 std::equal_to<size_t>, 57 std::equal_to<size_t>,
59 slice_allocator< std::pair<const std::size_t, archetype *> > 58 slice_allocator< std::pair<const std::size_t, archetype *> >
60 true, 59 true,
61 > HT; 60 > HT;
62 61
63static HT ht; 62static HT ht;
63#else
64static arch_ptr arch_table[ARCHTABLE];
64#endif 65#endif
65 66
66/** 67/**
67 * GROS - This function retrieves an archetype given the name that appears 68 * GROS - This function retrieves an archetype given the name that appears
68 * during the game (for example, "writing pen" instead of "stylus"). 69 * during the game (for example, "writing pen" instead of "stylus").
… …
118 * If type is -1, ew don't match on type. 119 * If type is -1, ew don't match on type.
119 */ 120 */
120object * 121object *
121get_archetype_by_skill_name (const char *skill, int type) 122get_archetype_by_skill_name (const char *skill, int type)
122{ 123{
123 archetype * 124 archetype *at;
124 at;
125 125
126 if (skill == NULL) 126 if (skill)
127 return NULL;
128
129 for (at = first_archetype; at != NULL; at = at->next) 127 for (at = first_archetype; at; at = at->next)
130 {
131 if (((type == -1) || (type == at->clone.type)) && (!strcmp (at->clone.skill, skill))) 128 if (((type == -1) || (type == at->clone.type)) && (!strcmp (at->clone.skill, skill)))
132 return arch_to_object (at); 129 return arch_to_object (at);
133 } 130
134 return NULL; 131 return 0;
135} 132}
136 133
137/* similiar to above - this returns the first archetype 134/* similiar to above - this returns the first archetype
138 * that matches both the type and subtype. type and subtype 135 * 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 136 * can be -1 to say ignore, but in this case, the match it does
… …
179 for (i = strlen (tmpname); i > 0; i--) 176 for (i = strlen (tmpname); i > 0; i--)
180 { 177 {
181 tmpname[i] = 0; 178 tmpname[i] = 0;
182 at = find_archetype_by_object_name (tmpname); 179 at = find_archetype_by_object_name (tmpname);
183 180
184 if (at != NULL) 181 if (at)
185 return arch_to_object (at); 182 return arch_to_object (at);
186 } 183 }
187 184
188 return create_singularity (name); 185 return create_singularity (name);
189} 186}
… …
358 archetype *at; 355 archetype *at;
359 356
360 LOG (llevDebug, " Setting up archetable...\n"); 357 LOG (llevDebug, " Setting up archetable...\n");
361 358
362 for (at = first_archetype; at != NULL; at = (at->more == NULL) ? at->next : at->more) 359 for (at = first_archetype; at != NULL; at = (at->more == NULL) ? at->next : at->more)
363 add_arch (at); 360 at->hash_add ();
364 361
365 LOG (llevDebug, "done\n"); 362 LOG (llevDebug, "done\n");
366} 363}
367 364
368void 365void
… …
381 delete 378 delete
382 at; 379 at;
383 380
384 i++; 381 i++;
385 } 382 }
383
386 LOG (llevDebug, "Freed %d archetypes, %d faces\n", i, f); 384 LOG (llevDebug, "Freed %d archetypes, %d faces\n", i, f);
387} 385}
388 386
389archetype::archetype () 387archetype::archetype ()
390{ 388{
391 clear_object (&clone); /* to initial state other also */
392 CLEAR_FLAG (&clone, FLAG_FREED); /* This shouldn't matter, since copy_object() */ 389 CLEAR_FLAG (&clone, FLAG_FREED); /* This shouldn't matter, since copy_to */
393 SET_FLAG (&clone, FLAG_REMOVED); /* doesn't copy these flags... */ 390 SET_FLAG (&clone, FLAG_REMOVED); /* doesn't copy these flags... */
394} 391}
395 392
396archetype::~archetype () 393archetype::~archetype ()
397{ 394{
… …
402 * of archetype-structures. 399 * of archetype-structures.
403 */ 400 */
404void 401void
405first_arch_pass (object_thawer & fp) 402first_arch_pass (object_thawer & fp)
406{ 403{
407 archetype *at, *head = NULL, *last_more = NULL; 404 archetype *head = 0, *last_more = 0;
408 405
406 archetype *at = new archetype;
409 at->clone.arch = first_archetype = at = new archetype; 407 at->clone.arch = first_archetype = at;
410 408
411 while (int i = load_object (fp, &at->clone, 0)) 409 while (int i = load_object (fp, &at->clone, 0))
412 { 410 {
413 at->clone.speed_left = (float) (-0.1); 411 at->clone.speed_left = (float) (-0.1);
414 /* copy the body_info to the body_used - this is only really 412 /* copy the body_info to the body_used - this is only really
… …
552void 550void
553load_archetypes (void) 551load_archetypes (void)
554{ 552{
555 char filename[MAX_BUF]; 553 char filename[MAX_BUF];
556 554
557#if TIME_ARCH_LOAD
558 struct timeval
559 tv1,
560 tv2;
561#endif
562
563 sprintf (filename, "%s/%s", settings.datadir, settings.archetypes); 555 sprintf (filename, "%s/%s", settings.datadir, settings.archetypes);
564 LOG (llevDebug, "Reading archetypes from %s:\n", filename); 556 LOG (llevDebug, "Reading archetypes from %s:\n", filename);
565 557
566 { 558 {
567 object_thawer 559 object_thawer
… …
580 object_thawer 572 object_thawer
581 thawer (filename); 573 thawer (filename);
582 574
583 LOG (llevDebug, " loading treasure...\n"); 575 LOG (llevDebug, " loading treasure...\n");
584 load_treasures (); 576 load_treasures ();
577 LOG (llevDebug, " done\n");
585 LOG (llevDebug, " done\n arch-pass 2...\n"); 578 LOG (llevDebug, " arch-pass 2...\n");
586 second_arch_pass (thawer); 579 second_arch_pass (thawer);
587 LOG (llevDebug, " done\n"); 580 LOG (llevDebug, " done\n");
588#ifdef DEBUG 581#ifdef DEBUG
589 check_generators (); 582 check_generators ();
590#endif 583#endif
… …
594 587
595/* 588/*
596 * Creates and returns a new object which is a copy of the given archetype. 589 * Creates and returns a new object which is a copy of the given archetype.
597 * This function returns NULL on failure. 590 * This function returns NULL on failure.
598 */ 591 */
599
600object * 592object *
601arch_to_object (archetype *at) 593arch_to_object (archetype *at)
602{ 594{
603 object *op; 595 object *op;
604 596
… …
608 LOG (llevError, "Couldn't find archetype.\n"); 600 LOG (llevError, "Couldn't find archetype.\n");
609 601
610 return NULL; 602 return NULL;
611 } 603 }
612 604
613 op = get_object (); 605 op = at->clone.clone ();
614 copy_object (&at->clone, op);
615 op->arch = at; 606 op->arch = at;
616 op->instantiate (); 607 op->instantiate ();
617 return op; 608 return op;
618} 609}
619 610
… …
621 * Creates an object. This function is called by get_archetype() 612 * Creates an object. This function is called by get_archetype()
622 * if it fails to find the appropriate archetype. 613 * if it fails to find the appropriate archetype.
623 * Thus get_archetype() will be guaranteed to always return 614 * Thus get_archetype() will be guaranteed to always return
624 * an object, and never NULL. 615 * an object, and never NULL.
625 */ 616 */
626
627object * 617object *
628create_singularity (const char *name) 618create_singularity (const char *name)
629{ 619{
630 object *op; 620 object *op;
631 char buf[MAX_BUF]; 621 char buf[MAX_BUF];
632 622
633 sprintf (buf, "%s (%s)", ARCH_SINGULARITY, name); 623 sprintf (buf, "%s (%s)", ARCH_SINGULARITY, name);
634 op = get_object (); 624 op = object::create ();
635 op->name = op->name_pl = buf; 625 op->name = op->name_pl = buf;
636 SET_FLAG (op, FLAG_NO_PICK); 626 SET_FLAG (op, FLAG_NO_PICK);
637 return op; 627 return op;
638} 628}
639 629
640/* 630/*
641 * Finds which archetype matches the given name, and returns a new 631 * Finds which archetype matches the given name, and returns a new
642 * object containing a copy of the archetype. 632 * object containing a copy of the archetype.
643 */ 633 */
644
645object * 634object *
646get_archetype (const char *name) 635get_archetype (const char *name)
647{ 636{
648 archetype *at = archetype::find (name); 637 archetype *at = archetype::find (name);
649 638
… …
731} 720}
732 721
733/* 722/*
734 * Adds an archetype to the hashtable. 723 * Adds an archetype to the hashtable.
735 */ 724 */
736 725void
737static void 726archetype::hash_add ()
738add_arch (archetype *at)
739{ 727{
740#if USE_UNORDERED_MAP 728#if USE_UNORDERED_MAP
741 ht.insert (std::make_pair ((size_t) (const char *) at->name, at)); 729 ht.insert (std::make_pair ((size_t) (const char *) name, this));
742#endif 730#else
743 731
744 int index = hasharch ((const char *) at->name, ARCHTABLE), org_index = index; 732 int index = hasharch ((const char *) name, ARCHTABLE), org_index = index;
745 733
746 for (;;) 734 for (;;)
747 { 735 {
748 if (arch_table[index] == NULL) 736 if (!arch_table[index])
749 { 737 {
750 arch_table[index] = at; 738 arch_table[index] = this;
751 return; 739 break;
752 } 740 }
753 741
754 if (++index == ARCHTABLE) 742 if (++index == ARCHTABLE)
755 index = 0; 743 index = 0;
756 744
757 if (index == org_index) 745 if (index == org_index)
758 fatal (ARCHTABLE_TOO_SMALL); 746 fatal (ARCHTABLE_TOO_SMALL);
759 } 747 }
748#endif
749}
750
751void
752archetype::hash_del ()
753{
754#if USE_UNORDERED_MAP
755# error remove this from HT
756#else
757
758 int index = hasharch ((const char *) name, ARCHTABLE), org_index = index;
759
760 for (;;)
761 {
762 if (arch_table[index] == this)
763 {
764 arch_table[index] = 0;
765 break;
766 }
767
768 if (++index == ARCHTABLE)
769 index = 0;
770
771 if (index == org_index)
772 break;
773 }
774#endif
760} 775}
761 776
762/* 777/*
763 * Returns the first archetype using the given type. 778 * Returns the first archetype using the given type.
764 * Used in treasure-generation. 779 * Used in treasure-generation.
… …
784 799
785object * 800object *
786clone_arch (int type) 801clone_arch (int type)
787{ 802{
788 archetype *at; 803 archetype *at;
789 object *op = get_object ();
790 804
791 if ((at = type_to_archetype (type)) == NULL) 805 if ((at = type_to_archetype (type)) == NULL)
792 { 806 {
793 LOG (llevError, "Can't clone archetype %d\n", type); 807 LOG (llevError, "Can't clone archetype %d\n", type);
794 free_object (op);
795 return NULL; 808 return 0;
796 } 809 }
797 810
798 copy_object (&at->clone, op); 811 object *op = at->clone.clone ();
799 op->instantiate (); 812 op->instantiate ();
800 return op; 813 return op;
801} 814}
802 815
803/* 816/*

Diff Legend

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