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.24 by root, Sat Sep 16 22:24:12 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 <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 33
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 */ 34int arch_init; /* True if doing arch initialization */
42 35
43/* The naming of these functions is really poor - they are all 36/* The naming of these functions is really poor - they are all
44 * pretty much named '.._arch_...', but they may more may not 37 * pretty much named '.._arch_...', but they may more may not
45 * return archetypes. Some make the arch_to_object call, and thus 38 * return archetypes. Some make the arch_to_object call, and thus
46 * return an object. Perhaps those should be called 'archob' functions 39 * return an object. Perhaps those should be called 'archob' functions
47 * to denote they return an object derived from the archetype. 40 * to denote they return an object derived from the archetype.
48 * MSW 2003-04-29 41 * MSW 2003-04-29
49 */ 42 */
50 43
51#if USE_UNORDERED_MAP
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
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 add_arch (at); 326 at->hash_add ();
364 327
365 LOG (llevDebug, "done\n"); 328 LOG (llevDebug, "done\n");
366}
367
368/*
369 * Dumps an archetype to debug-level output.
370 */
371
372void
373dump_arch (archetype *at)
374{
375 dump_object (&at->clone);
376}
377
378/*
379 * Dumps _all_ archetypes to debug-level output.
380 * If you run crossfire with debug, and enter DM-mode, you can trigger
381 * this with the O key.
382 */
383
384void
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 }
394} 329}
395 330
396void 331void
397free_all_archs (void) 332free_all_archs (void)
398{ 333{
399 archetype *at, *next; 334 archetype *at, *next;
400 int i = 0, f = 0; 335 int i = 0, f = 0;
401 336
402 for (at = first_archetype; at != NULL; at = next) 337 for (at = first_archetype; at; at = next)
403 { 338 {
404 if (at->more) 339 if (at->more)
405 next = at->more; 340 next = at->more;
406 else 341 else
407 next = at->next; 342 next = at->next;
… …
409 delete 344 delete
410 at; 345 at;
411 346
412 i++; 347 i++;
413 } 348 }
349
414 LOG (llevDebug, "Freed %d archetypes, %d faces\n", i, f); 350 LOG (llevDebug, "Freed %d archetypes, %d faces\n", i, f);
415} 351}
416 352
417archetype::archetype () 353archetype::archetype ()
418{ 354{
419 clear_object (&clone); /* to initial state other also */
420 CLEAR_FLAG (&clone, FLAG_FREED); /* This shouldn't matter, since copy_object() */ 355 CLEAR_FLAG (&clone, FLAG_FREED); /* This shouldn't matter, since copy_to */
421 SET_FLAG (&clone, FLAG_REMOVED); /* doesn't copy these flags... */ 356 SET_FLAG (&clone, FLAG_REMOVED); /* doesn't copy these flags... */
422} 357}
423 358
424archetype::~archetype () 359archetype::~archetype ()
425{ 360{
… …
430 * of archetype-structures. 365 * of archetype-structures.
431 */ 366 */
432void 367void
433first_arch_pass (object_thawer & fp) 368first_arch_pass (object_thawer & fp)
434{ 369{
435 archetype *at, *head = NULL, *last_more = NULL; 370 archetype *head = 0, *last_more = 0;
436 371
372 archetype *at = new archetype;
437 at->clone.arch = first_archetype = at = new archetype; 373 at->clone.arch = first_archetype = at;
438 374
439 while (int i = load_object (fp, &at->clone, 0)) 375 while (int i = load_object (fp, &at->clone, 0))
440 { 376 {
441 at->clone.speed_left = (float) (-0.1); 377 at->clone.speed_left = (float) (-0.1);
442 /* copy the body_info to the body_used - this is only really 378 /* copy the body_info to the body_used - this is only really
… …
580void 516void
581load_archetypes (void) 517load_archetypes (void)
582{ 518{
583 char filename[MAX_BUF]; 519 char filename[MAX_BUF];
584 520
585#if TIME_ARCH_LOAD
586 struct timeval
587 tv1,
588 tv2;
589#endif
590
591 sprintf (filename, "%s/%s", settings.datadir, settings.archetypes); 521 sprintf (filename, "%s/%s", settings.datadir, settings.archetypes);
592 LOG (llevDebug, "Reading archetypes from %s:\n", filename); 522 LOG (llevDebug, "Reading archetypes from %s:\n", filename);
593 523
594 { 524 {
595 object_thawer 525 object_thawer
596 thawer (filename); 526 thawer (filename);
597 527
598 clear_archetable ();
599 LOG (llevDebug, " arch-pass 1...\n"); 528 LOG (llevDebug, " arch-pass 1...\n");
600 first_arch_pass (thawer); 529 first_arch_pass (thawer);
601 LOG (llevDebug, " done\n"); 530 LOG (llevDebug, " done\n");
602 } 531 }
603 532
… …
608 object_thawer 537 object_thawer
609 thawer (filename); 538 thawer (filename);
610 539
611 LOG (llevDebug, " loading treasure...\n"); 540 LOG (llevDebug, " loading treasure...\n");
612 load_treasures (); 541 load_treasures ();
542 LOG (llevDebug, " done\n");
613 LOG (llevDebug, " done\n arch-pass 2...\n"); 543 LOG (llevDebug, " arch-pass 2...\n");
614 second_arch_pass (thawer); 544 second_arch_pass (thawer);
615 LOG (llevDebug, " done\n"); 545 LOG (llevDebug, " done\n");
616#ifdef DEBUG 546#ifdef DEBUG
617 check_generators (); 547 check_generators ();
618#endif 548#endif
… …
622 552
623/* 553/*
624 * 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.
625 * This function returns NULL on failure. 555 * This function returns NULL on failure.
626 */ 556 */
627
628object * 557object *
629arch_to_object (archetype *at) 558arch_to_object (archetype *at)
630{ 559{
631 object *op; 560 object *op;
632 561
… …
636 LOG (llevError, "Couldn't find archetype.\n"); 565 LOG (llevError, "Couldn't find archetype.\n");
637 566
638 return NULL; 567 return NULL;
639 } 568 }
640 569
641 op = get_object (); 570 op = at->clone.clone ();
642 copy_object (&at->clone, op);
643 op->arch = at; 571 op->arch = at;
644 op->instantiate (); 572 op->instantiate ();
645 return op; 573 return op;
646} 574}
647 575
… …
649 * Creates an object. This function is called by get_archetype() 577 * Creates an object. This function is called by get_archetype()
650 * if it fails to find the appropriate archetype. 578 * if it fails to find the appropriate archetype.
651 * Thus get_archetype() will be guaranteed to always return 579 * Thus get_archetype() will be guaranteed to always return
652 * an object, and never NULL. 580 * an object, and never NULL.
653 */ 581 */
654
655object * 582object *
656create_singularity (const char *name) 583create_singularity (const char *name)
657{ 584{
658 object *op; 585 object *op;
659 char buf[MAX_BUF]; 586 char buf[MAX_BUF];
660 587
661 sprintf (buf, "%s (%s)", ARCH_SINGULARITY, name); 588 sprintf (buf, "%s (%s)", ARCH_SINGULARITY, name);
662 op = get_object (); 589 op = object::create ();
663 op->name = op->name_pl = buf; 590 op->name = op->name_pl = buf;
664 SET_FLAG (op, FLAG_NO_PICK); 591 SET_FLAG (op, FLAG_NO_PICK);
665 return op; 592 return op;
666} 593}
667 594
668/* 595/*
669 * Finds which archetype matches the given name, and returns a new 596 * Finds which archetype matches the given name, and returns a new
670 * object containing a copy of the archetype. 597 * object containing a copy of the archetype.
671 */ 598 */
672
673object * 599object *
674get_archetype (const char *name) 600get_archetype (const char *name)
675{ 601{
676 archetype *at = archetype::find (name); 602 archetype *at = archetype::find (name);
677 603
… …
713 639
714/* 640/*
715 * Finds, using the hashtable, which archetype matches the given name. 641 * Finds, using the hashtable, which archetype matches the given name.
716 * returns a pointer to the found archetype, otherwise NULL. 642 * returns a pointer to the found archetype, otherwise NULL.
717 */ 643 */
718
719archetype * 644archetype *
720archetype::find (const char *name) 645archetype::find (const char *name)
721{ 646{
722 if (!name) 647 if (!name)
723 return 0; 648 return 0;
724 649
725#if USE_UNORDERED_MAP
726 AUTODECL (i, ht.find ((size_t) name)); 650 AUTODECL (i, ht.find (name));
727 651
728 if (i == ht.end ()) 652 if (i == ht.end ())
729 return 0; 653 return 0;
730 else 654 else
731 return i->second; 655 return i->second;
732#endif
733
734 archetype *at;
735 unsigned long index;
736
737 index = hasharch (name, ARCHTABLE);
738 arch_search++;
739 for (;;)
740 {
741 at = arch_table[index];
742
743 if (at == NULL)
744 {
745 if (warn_archetypes)
746 LOG (llevError, "Couldn't find archetype %s\n", name);
747
748 return NULL;
749 }
750
751 arch_cmp++;
752
753 if (!strcmp ((const char *) at->name, name))
754 return at;
755
756 if (++index >= ARCHTABLE)
757 index = 0;
758 }
759} 656}
760 657
761/* 658/*
762 * Adds an archetype to the hashtable. 659 * Adds an archetype to the hashtable.
763 */ 660 */
764 661void
765static void 662archetype::hash_add ()
766add_arch (archetype *at)
767{ 663{
768#if USE_UNORDERED_MAP 664 ht.insert (std::make_pair (name, this));
769 ht.insert (std::make_pair ((size_t) (const char *) at->name, at)); 665}
770#endif
771 666
772 int index = hasharch ((const char *) at->name, ARCHTABLE), org_index = index; 667void
773 668archetype::hash_del ()
774 for (;;) 669{
775 { 670 ht.erase (name);
776 if (arch_table[index] == NULL)
777 {
778 arch_table[index] = at;
779 return;
780 }
781
782 if (++index == ARCHTABLE)
783 index = 0;
784
785 if (index == org_index)
786 fatal (ARCHTABLE_TOO_SMALL);
787 }
788} 671}
789 672
790/* 673/*
791 * Returns the first archetype using the given type. 674 * Returns the first archetype using the given type.
792 * Used in treasure-generation. 675 * Used in treasure-generation.
793 */ 676 */
794
795archetype * 677archetype *
796type_to_archetype (int type) 678type_to_archetype (int type)
797{ 679{
798 archetype *at; 680 archetype *at;
799 681
… …
812 694
813object * 695object *
814clone_arch (int type) 696clone_arch (int type)
815{ 697{
816 archetype *at; 698 archetype *at;
817 object *op = get_object ();
818 699
819 if ((at = type_to_archetype (type)) == NULL) 700 if ((at = type_to_archetype (type)) == NULL)
820 { 701 {
821 LOG (llevError, "Can't clone archetype %d\n", type); 702 LOG (llevError, "Can't clone archetype %d\n", type);
822 free_object (op);
823 return NULL; 703 return 0;
824 } 704 }
825 705
826 copy_object (&at->clone, op); 706 object *op = at->clone.clone ();
827 op->instantiate (); 707 op->instantiate ();
828 return op; 708 return op;
829} 709}
830 710
831/* 711/*

Diff Legend

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