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.30 by root, Wed Dec 13 00:42:03 2006 UTC vs.
Revision 1.38 by root, Fri Feb 2 21:50:43 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 <global.h> 27#include <global.h>
27#include <funcpoint.h> 28#include <funcpoint.h>
28#include <loader.h> 29#include <loader.h>
29 30
30#define USE_UNORDERED_MAP 0
31
32#if USE_UNORDERED_MAP
33# include <tr1/functional> 31#include <tr1/functional>
34# include <tr1/unordered_map> 32#include <tr1/unordered_map>
35#endif
36 33
37int arch_cmp = 0; /* How many strcmp's */
38int arch_search = 0; /* How many searches */
39int arch_init; /* True if doing arch initialization */ 34int arch_init; /* True if doing arch initialization */
40 35
41/* The naming of these functions is really poor - they are all 36/* The naming of these functions is really poor - they are all
42 * pretty much named '.._arch_...', but they may more may not 37 * pretty much named '.._arch_...', but they may more may not
43 * return archetypes. Some make the arch_to_object call, and thus 38 * return archetypes. Some make the arch_to_object call, and thus
44 * return an object. Perhaps those should be called 'archob' functions 39 * return an object. Perhaps those should be called 'archob' functions
45 * to denote they return an object derived from the archetype. 40 * to denote they return an object derived from the archetype.
46 * MSW 2003-04-29 41 * MSW 2003-04-29
47 */ 42 */
48 43
49#if USE_UNORDERED_MAP
50// the hashtable 44// the hashtable
51typedef std::tr1::unordered_map 45typedef std::tr1::unordered_map
52 < 46 <
53 std::size_t, 47 const char *,
54 arch_ptr, 48 arch_ptr,
55 std::tr1::hash<size_t>, 49 str_hash,
56 std::equal_to<size_t>, 50 str_equal,
57 slice_allocator< std::pair<const std::size_t, archetype *> > 51 slice_allocator< std::pair<const char *const, arch_ptr> >
58 true,
59 > HT; 52 > HT;
60 53
61static HT ht; 54static HT ht (5000);
62#else
63static arch_ptr arch_table[ARCHTABLE];
64#endif
65 55
66/** 56/**
67 * GROS - This function retrieves an archetype given the name that appears 57 * GROS - This function retrieves an archetype given the name that appears
68 * during the game (for example, "writing pen" instead of "stylus"). 58 * 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. 59 * It does not use the hashtable system, but browse the whole archlist each time.
… …
118 * If type is -1, ew don't match on type. 108 * If type is -1, ew don't match on type.
119 */ 109 */
120object * 110object *
121get_archetype_by_skill_name (const char *skill, int type) 111get_archetype_by_skill_name (const char *skill, int type)
122{ 112{
123 archetype * 113 archetype *at;
124 at;
125 114
126 if (skill == NULL) 115 if (skill)
127 return NULL;
128
129 for (at = first_archetype; at != NULL; at = at->next) 116 for (at = first_archetype; at; at = at->next)
130 {
131 if (((type == -1) || (type == at->clone.type)) && (!strcmp (at->clone.skill, skill))) 117 if (((type == -1) || (type == at->clone.type)) && (!strcmp (at->clone.skill, skill)))
132 return arch_to_object (at); 118 return arch_to_object (at);
133 } 119
134 return NULL; 120 return 0;
135} 121}
136 122
137/* similiar to above - this returns the first archetype 123/* similiar to above - this returns the first archetype
138 * that matches both the type and subtype. type and subtype 124 * 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 125 * can be -1 to say ignore, but in this case, the match it does
… …
179 for (i = strlen (tmpname); i > 0; i--) 165 for (i = strlen (tmpname); i > 0; i--)
180 { 166 {
181 tmpname[i] = 0; 167 tmpname[i] = 0;
182 at = find_archetype_by_object_name (tmpname); 168 at = find_archetype_by_object_name (tmpname);
183 169
184 if (at != NULL) 170 if (at)
185 return arch_to_object (at); 171 return arch_to_object (at);
186 } 172 }
187 173
188 return create_singularity (name); 174 return create_singularity (name);
189} 175}
… …
325 311
326/* init_blocksview();*/ 312/* init_blocksview();*/
327} 313}
328 314
329/* 315/*
330 * Stores debug-information about how efficient the hashtable
331 * used for archetypes has been in the static errmsg array.
332 */
333
334void
335arch_info (object *op)
336{
337 sprintf (errmsg, "%d searches and %d strcmp()'s", arch_search, arch_cmp);
338 new_draw_info (NDI_BLACK, 0, op, errmsg);
339}
340
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_... 316 * An alternative way to init the hashtable which is slower, but _works_...
353 */ 317 */
354
355void 318void
356init_archetable (void) 319init_archetable (void)
357{ 320{
358 archetype *at; 321 archetype *at;
359 322
360 LOG (llevDebug, " Setting up archetable...\n"); 323 LOG (llevDebug, " Setting up archetable...\n");
361 324
362 for (at = first_archetype; at != NULL; at = (at->more == NULL) ? at->next : at->more) 325 for (at = first_archetype; at; at = at->more ? at->more : at->next)
363 at->hash_add (); 326 at->hash_add ();
364 327
365 LOG (llevDebug, "done\n"); 328 LOG (llevDebug, "done\n");
366} 329}
367 330
… …
369free_all_archs (void) 332free_all_archs (void)
370{ 333{
371 archetype *at, *next; 334 archetype *at, *next;
372 int i = 0, f = 0; 335 int i = 0, f = 0;
373 336
374 for (at = first_archetype; at != NULL; at = next) 337 for (at = first_archetype; at; at = next)
375 { 338 {
376 if (at->more) 339 if (at->more)
377 next = at->more; 340 next = at->more;
378 else 341 else
379 next = at->next; 342 next = at->next;
… …
387 LOG (llevDebug, "Freed %d archetypes, %d faces\n", i, f); 350 LOG (llevDebug, "Freed %d archetypes, %d faces\n", i, f);
388} 351}
389 352
390archetype::archetype () 353archetype::archetype ()
391{ 354{
392 clear_object (&clone); /* to initial state other also */
393 CLEAR_FLAG (&clone, FLAG_FREED); /* This shouldn't matter, since copy_to */ 355 CLEAR_FLAG (&clone, FLAG_FREED); /* This shouldn't matter, since copy_to */
394 SET_FLAG (&clone, FLAG_REMOVED); /* doesn't copy these flags... */ 356 SET_FLAG (&clone, FLAG_REMOVED); /* doesn't copy these flags... */
395} 357}
396 358
397archetype::~archetype () 359archetype::~archetype ()
… …
561 523
562 { 524 {
563 object_thawer 525 object_thawer
564 thawer (filename); 526 thawer (filename);
565 527
566 clear_archetable ();
567 LOG (llevDebug, " arch-pass 1...\n"); 528 LOG (llevDebug, " arch-pass 1...\n");
568 first_arch_pass (thawer); 529 first_arch_pass (thawer);
569 LOG (llevDebug, " done\n"); 530 LOG (llevDebug, " done\n");
570 } 531 }
571 532
… …
576 object_thawer 537 object_thawer
577 thawer (filename); 538 thawer (filename);
578 539
579 LOG (llevDebug, " loading treasure...\n"); 540 LOG (llevDebug, " loading treasure...\n");
580 load_treasures (); 541 load_treasures ();
542 LOG (llevDebug, " done\n");
581 LOG (llevDebug, " done\n arch-pass 2...\n"); 543 LOG (llevDebug, " arch-pass 2...\n");
582 second_arch_pass (thawer); 544 second_arch_pass (thawer);
583 LOG (llevDebug, " done\n"); 545 LOG (llevDebug, " done\n");
584#ifdef DEBUG 546#ifdef DEBUG
585 check_generators (); 547 check_generators ();
586#endif 548#endif
… …
590 552
591/* 553/*
592 * Creates and returns a new object which is a copy of the given archetype. 554 * Creates and returns a new object which is a copy of the given archetype.
593 * This function returns NULL on failure. 555 * This function returns NULL on failure.
594 */ 556 */
595
596object * 557object *
597arch_to_object (archetype *at) 558arch_to_object (archetype *at)
598{ 559{
599 object *op; 560 object *op;
600 561
… …
616 * Creates an object. This function is called by get_archetype() 577 * Creates an object. This function is called by get_archetype()
617 * if it fails to find the appropriate archetype. 578 * if it fails to find the appropriate archetype.
618 * Thus get_archetype() will be guaranteed to always return 579 * Thus get_archetype() will be guaranteed to always return
619 * an object, and never NULL. 580 * an object, and never NULL.
620 */ 581 */
621
622object * 582object *
623create_singularity (const char *name) 583create_singularity (const char *name)
624{ 584{
625 object *op; 585 object *op;
626 char buf[MAX_BUF]; 586 char buf[MAX_BUF];
… …
634 594
635/* 595/*
636 * Finds which archetype matches the given name, and returns a new 596 * Finds which archetype matches the given name, and returns a new
637 * object containing a copy of the archetype. 597 * object containing a copy of the archetype.
638 */ 598 */
639
640object * 599object *
641get_archetype (const char *name) 600get_archetype (const char *name)
642{ 601{
643 archetype *at = archetype::find (name); 602 archetype *at = archetype::find (name);
644 603
… …
680 639
681/* 640/*
682 * Finds, using the hashtable, which archetype matches the given name. 641 * Finds, using the hashtable, which archetype matches the given name.
683 * returns a pointer to the found archetype, otherwise NULL. 642 * returns a pointer to the found archetype, otherwise NULL.
684 */ 643 */
685
686archetype * 644archetype *
687archetype::find (const char *name) 645archetype::find (const char *name)
688{ 646{
689 if (!name) 647 if (!name)
690 return 0; 648 return 0;
691 649
692#if USE_UNORDERED_MAP
693 AUTODECL (i, ht.find ((size_t) name)); 650 AUTODECL (i, ht.find (name));
694 651
695 if (i == ht.end ()) 652 if (i == ht.end ())
696 return 0; 653 return 0;
697 else 654 else
698 return i->second; 655 return i->second;
699#endif
700
701 archetype *at;
702 unsigned long index;
703
704 index = hasharch (name, ARCHTABLE);
705 arch_search++;
706 for (;;)
707 {
708 at = arch_table[index];
709
710 if (at == NULL)
711 {
712 if (warn_archetypes)
713 LOG (llevError, "Couldn't find archetype %s\n", name);
714
715 return NULL;
716 }
717
718 arch_cmp++;
719
720 if (!strcmp ((const char *) at->name, name))
721 return at;
722
723 if (++index >= ARCHTABLE)
724 index = 0;
725 }
726} 656}
727 657
728/* 658/*
729 * Adds an archetype to the hashtable. 659 * Adds an archetype to the hashtable.
730 */ 660 */
731void 661void
732archetype::hash_add () 662archetype::hash_add ()
733{ 663{
734#if USE_UNORDERED_MAP
735 ht.insert (std::make_pair ((size_t) (const char *) name, this)); 664 ht.insert (std::make_pair (name, this));
736#else
737
738 int index = hasharch ((const char *) name, ARCHTABLE), org_index = index;
739
740 for (;;)
741 {
742 if (!arch_table[index])
743 {
744 arch_table[index] = this;
745 break;
746 }
747
748 if (++index == ARCHTABLE)
749 index = 0;
750
751 if (index == org_index)
752 fatal (ARCHTABLE_TOO_SMALL);
753 }
754#endif
755} 665}
756 666
757void 667void
758archetype::hash_del () 668archetype::hash_del ()
759{ 669{
760#if USE_UNORDERED_MAP 670 ht.erase (name);
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
781} 671}
782 672
783/* 673/*
784 * Returns the first archetype using the given type. 674 * Returns the first archetype using the given type.
785 * Used in treasure-generation. 675 * Used in treasure-generation.
786 */ 676 */
787
788archetype * 677archetype *
789type_to_archetype (int type) 678type_to_archetype (int type)
790{ 679{
791 archetype *at; 680 archetype *at;
792 681

Diff Legend

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