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.22 by root, Thu Sep 14 22:35:53 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}
… …
269 retval = 15; 255 retval = 15;
270 else if (!strncasecmp (cp, query_base_name (op, 0), strlen (cp))) 256 else if (!strncasecmp (cp, query_base_name (op, 0), strlen (cp)))
271 retval = 14; 257 retval = 14;
272 else if (!strncasecmp (cp, query_base_name (op, 1), strlen (cp))) 258 else if (!strncasecmp (cp, query_base_name (op, 1), strlen (cp)))
273 retval = 14; 259 retval = 14;
274
275 /* Do substring checks, so things like 'Str+1' will match. 260 /* Do substring checks, so things like 'Str+1' will match.
276 * retval of these should perhaps be lower - they are lower 261 * retval of these should perhaps be lower - they are lower
277 * then the specific strcasecmp aboves, but still higher than 262 * then the specific strcasecmp aboves, but still higher than
278 * some other match criteria. 263 * some other match criteria.
279 */ 264 */
… …
281 retval = 12; 266 retval = 12;
282 else if (strstr (query_base_name (op, 0), cp)) 267 else if (strstr (query_base_name (op, 0), cp))
283 retval = 12; 268 retval = 12;
284 else if (strstr (query_short_name (op), cp)) 269 else if (strstr (query_short_name (op), cp))
285 retval = 12; 270 retval = 12;
286
287 /* Check against plural/non plural based on count. */ 271 /* Check against plural/non plural based on count. */
288 else if (count > 1 && !strcasecmp (cp, op->name_pl)) 272 else if (count > 1 && !strcasecmp (cp, op->name_pl))
289 {
290 retval = 6; 273 retval = 6;
291 }
292 else if (count == 1 && !strcasecmp (op->name, cp)) 274 else if (count == 1 && !strcasecmp (op->name, cp))
293 {
294 retval = 6; 275 retval = 6;
295 }
296 /* base name matched - not bad */ 276 /* base name matched - not bad */
297 else if (strcasecmp (cp, op->name) == 0 && !count) 277 else if (strcasecmp (cp, op->name) == 0 && !count)
298 retval = 4; 278 retval = 4;
299 /* Check for partial custom name, but give a real low priority */ 279 /* Check for partial custom name, but give a real low priority */
300 else if (op->custom_name && strstr (op->custom_name, cp)) 280 else if (op->custom_name && strstr (op->custom_name, cp))
… …
302 282
303 if (retval) 283 if (retval)
304 { 284 {
305 if (pl->type == PLAYER) 285 if (pl->type == PLAYER)
306 pl->contr->count = count; 286 pl->contr->count = count;
287
307 return retval; 288 return retval;
308 } 289 }
309 } 290 }
291
310 return 0; 292 return 0;
311} 293}
312 294
313/* 295/*
314 * Initialises the internal linked list of archetypes (read from file). 296 * Initialises the internal linked list of archetypes (read from file).
… …
329 311
330/* init_blocksview();*/ 312/* init_blocksview();*/
331} 313}
332 314
333/* 315/*
334 * Stores debug-information about how efficient the hashtable
335 * used for archetypes has been in the static errmsg array.
336 */
337
338void
339arch_info (object *op)
340{
341 sprintf (errmsg, "%d searches and %d strcmp()'s", arch_search, arch_cmp);
342 new_draw_info (NDI_BLACK, 0, op, errmsg);
343}
344
345/*
346 * Initialise the hashtable used by the archetypes.
347 */
348
349void
350clear_archetable (void)
351{
352 memset ((void *) arch_table, 0, ARCHTABLE * sizeof (archetype *));
353}
354
355/*
356 * 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_...
357 */ 317 */
358
359void 318void
360init_archetable (void) 319init_archetable (void)
361{ 320{
362 archetype *at; 321 archetype *at;
363 322
364 LOG (llevDebug, " Setting up archetable...\n"); 323 LOG (llevDebug, " Setting up archetable...\n");
365 324
366 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)
367 add_arch (at); 326 at->hash_add ();
368 327
369 LOG (llevDebug, "done\n"); 328 LOG (llevDebug, "done\n");
370}
371
372/*
373 * Dumps an archetype to debug-level output.
374 */
375
376void
377dump_arch (archetype *at)
378{
379 dump_object (&at->clone);
380}
381
382/*
383 * Dumps _all_ archetypes to debug-level output.
384 * If you run crossfire with debug, and enter DM-mode, you can trigger
385 * this with the O key.
386 */
387
388void
389dump_all_archetypes (void)
390{
391 archetype *at;
392
393 for (at = first_archetype; at != NULL; at = (at->more == NULL) ? at->next : at->more)
394 {
395 dump_arch (at);
396 fprintf (logfile, "%s\n", errmsg);
397 }
398} 329}
399 330
400void 331void
401free_all_archs (void) 332free_all_archs (void)
402{ 333{
403 archetype *at, *next; 334 archetype *at, *next;
404 int i = 0, f = 0; 335 int i = 0, f = 0;
405 336
406 for (at = first_archetype; at != NULL; at = next) 337 for (at = first_archetype; at; at = next)
407 { 338 {
408 if (at->more) 339 if (at->more)
409 next = at->more; 340 next = at->more;
410 else 341 else
411 next = at->next; 342 next = at->next;
… …
413 delete 344 delete
414 at; 345 at;
415 346
416 i++; 347 i++;
417 } 348 }
349
418 LOG (llevDebug, "Freed %d archetypes, %d faces\n", i, f); 350 LOG (llevDebug, "Freed %d archetypes, %d faces\n", i, f);
419} 351}
420 352
421archetype::archetype () 353archetype::archetype ()
422{ 354{
423 clear_object (&clone); /* to initial state other also */
424 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 */
425 SET_FLAG (&clone, FLAG_REMOVED); /* doesn't copy these flags... */ 356 SET_FLAG (&clone, FLAG_REMOVED); /* doesn't copy these flags... */
426} 357}
427 358
428archetype::~archetype () 359archetype::~archetype ()
429{ 360{
… …
434 * of archetype-structures. 365 * of archetype-structures.
435 */ 366 */
436void 367void
437first_arch_pass (object_thawer & fp) 368first_arch_pass (object_thawer & fp)
438{ 369{
439 archetype *at, *head = NULL, *last_more = NULL; 370 archetype *head = 0, *last_more = 0;
440 371
372 archetype *at = new archetype;
441 at->clone.arch = first_archetype = at = new archetype; 373 at->clone.arch = first_archetype = at;
442 374
443 while (int i = load_object (fp, &at->clone, 0)) 375 while (int i = load_object (fp, &at->clone, 0))
444 { 376 {
445 at->clone.speed_left = (float) (-0.1); 377 at->clone.speed_left = (float) (-0.1);
446 /* 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
… …
549 } 481 }
550 else if (!strcmp ("randomitems", variable)) 482 else if (!strcmp ("randomitems", variable))
551 { 483 {
552 if (at != NULL) 484 if (at != NULL)
553 { 485 {
554 treasurelist *
555 tl = find_treasurelist (argument); 486 treasurelist *tl = find_treasurelist (argument);
556 487
557 if (tl == NULL) 488 if (tl == NULL)
558 LOG (llevError, "Failed to link treasure to arch (%s): %s\n", &at->name, argument); 489 LOG (llevError, "Failed to link treasure to arch (%s): %s\n", &at->name, argument);
559 else 490 else
560 at->clone.randomitems = tl; 491 at->clone.randomitems = tl;
… …
585void 516void
586load_archetypes (void) 517load_archetypes (void)
587{ 518{
588 char filename[MAX_BUF]; 519 char filename[MAX_BUF];
589 520
590#if TIME_ARCH_LOAD
591 struct timeval
592 tv1,
593 tv2;
594#endif
595
596 sprintf (filename, "%s/%s", settings.datadir, settings.archetypes); 521 sprintf (filename, "%s/%s", settings.datadir, settings.archetypes);
597 LOG (llevDebug, "Reading archetypes from %s:\n", filename); 522 LOG (llevDebug, "Reading archetypes from %s:\n", filename);
598 523
599 { 524 {
600 object_thawer 525 object_thawer
601 thawer (filename); 526 thawer (filename);
602 527
603 clear_archetable ();
604 LOG (llevDebug, " arch-pass 1...\n"); 528 LOG (llevDebug, " arch-pass 1...\n");
605 first_arch_pass (thawer); 529 first_arch_pass (thawer);
606 LOG (llevDebug, " done\n"); 530 LOG (llevDebug, " done\n");
607 } 531 }
608 532
… …
613 object_thawer 537 object_thawer
614 thawer (filename); 538 thawer (filename);
615 539
616 LOG (llevDebug, " loading treasure...\n"); 540 LOG (llevDebug, " loading treasure...\n");
617 load_treasures (); 541 load_treasures ();
542 LOG (llevDebug, " done\n");
618 LOG (llevDebug, " done\n arch-pass 2...\n"); 543 LOG (llevDebug, " arch-pass 2...\n");
619 second_arch_pass (thawer); 544 second_arch_pass (thawer);
620 LOG (llevDebug, " done\n"); 545 LOG (llevDebug, " done\n");
621#ifdef DEBUG 546#ifdef DEBUG
622 check_generators (); 547 check_generators ();
623#endif 548#endif
… …
627 552
628/* 553/*
629 * 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.
630 * This function returns NULL on failure. 555 * This function returns NULL on failure.
631 */ 556 */
632
633object * 557object *
634arch_to_object (archetype *at) 558arch_to_object (archetype *at)
635{ 559{
636 object *op; 560 object *op;
637 561
… …
641 LOG (llevError, "Couldn't find archetype.\n"); 565 LOG (llevError, "Couldn't find archetype.\n");
642 566
643 return NULL; 567 return NULL;
644 } 568 }
645 569
646 op = get_object (); 570 op = at->clone.clone ();
647 copy_object (&at->clone, op);
648 op->arch = at; 571 op->arch = at;
649 op->instantiate (); 572 op->instantiate ();
650 return op; 573 return op;
651} 574}
652 575
… …
654 * Creates an object. This function is called by get_archetype() 577 * Creates an object. This function is called by get_archetype()
655 * if it fails to find the appropriate archetype. 578 * if it fails to find the appropriate archetype.
656 * Thus get_archetype() will be guaranteed to always return 579 * Thus get_archetype() will be guaranteed to always return
657 * an object, and never NULL. 580 * an object, and never NULL.
658 */ 581 */
659
660object * 582object *
661create_singularity (const char *name) 583create_singularity (const char *name)
662{ 584{
663 object *op; 585 object *op;
664 char buf[MAX_BUF]; 586 char buf[MAX_BUF];
665 587
666 sprintf (buf, "%s (%s)", ARCH_SINGULARITY, name); 588 sprintf (buf, "%s (%s)", ARCH_SINGULARITY, name);
667 op = get_object (); 589 op = object::create ();
668 op->name = op->name_pl = buf; 590 op->name = op->name_pl = buf;
669 SET_FLAG (op, FLAG_NO_PICK); 591 SET_FLAG (op, FLAG_NO_PICK);
670 return op; 592 return op;
671} 593}
672 594
673/* 595/*
674 * Finds which archetype matches the given name, and returns a new 596 * Finds which archetype matches the given name, and returns a new
675 * object containing a copy of the archetype. 597 * object containing a copy of the archetype.
676 */ 598 */
677
678object * 599object *
679get_archetype (const char *name) 600get_archetype (const char *name)
680{ 601{
681 archetype *at = archetype::find (name); 602 archetype *at = archetype::find (name);
682 603
… …
718 639
719/* 640/*
720 * Finds, using the hashtable, which archetype matches the given name. 641 * Finds, using the hashtable, which archetype matches the given name.
721 * returns a pointer to the found archetype, otherwise NULL. 642 * returns a pointer to the found archetype, otherwise NULL.
722 */ 643 */
723
724archetype * 644archetype *
725archetype::find (const char *name) 645archetype::find (const char *name)
726{ 646{
727 if (!name) 647 if (!name)
728 return 0; 648 return 0;
729 649
730#if USE_UNORDERED_MAP
731 AUTODECL (i, ht.find ((size_t) name)); 650 AUTODECL (i, ht.find (name));
732 651
733 if (i == ht.end ()) 652 if (i == ht.end ())
734 return 0; 653 return 0;
735 else 654 else
736 return i->second; 655 return i->second;
737#endif
738
739 archetype *at;
740 unsigned long index;
741
742 index = hasharch (name, ARCHTABLE);
743 arch_search++;
744 for (;;)
745 {
746 at = arch_table[index];
747
748 if (at == NULL)
749 {
750 if (warn_archetypes)
751 LOG (llevError, "Couldn't find archetype %s\n", name);
752
753 return NULL;
754 }
755
756 arch_cmp++;
757
758 if (!strcmp ((const char *) at->name, name))
759 return at;
760
761 if (++index >= ARCHTABLE)
762 index = 0;
763 }
764} 656}
765 657
766/* 658/*
767 * Adds an archetype to the hashtable. 659 * Adds an archetype to the hashtable.
768 */ 660 */
769 661void
770static void 662archetype::hash_add ()
771add_arch (archetype *at)
772{ 663{
773#if USE_UNORDERED_MAP 664 ht.insert (std::make_pair (name, this));
774 ht.insert (std::make_pair ((size_t) (const char *) at->name, at)); 665}
775#endif
776 666
777 int index = hasharch ((const char *) at->name, ARCHTABLE), org_index = index; 667void
778 668archetype::hash_del ()
779 for (;;) 669{
780 { 670 ht.erase (name);
781 if (arch_table[index] == NULL)
782 {
783 arch_table[index] = at;
784 return;
785 }
786
787 if (++index == ARCHTABLE)
788 index = 0;
789
790 if (index == org_index)
791 fatal (ARCHTABLE_TOO_SMALL);
792 }
793} 671}
794 672
795/* 673/*
796 * Returns the first archetype using the given type. 674 * Returns the first archetype using the given type.
797 * Used in treasure-generation. 675 * Used in treasure-generation.
798 */ 676 */
799
800archetype * 677archetype *
801type_to_archetype (int type) 678type_to_archetype (int type)
802{ 679{
803 archetype *at; 680 archetype *at;
804 681
… …
817 694
818object * 695object *
819clone_arch (int type) 696clone_arch (int type)
820{ 697{
821 archetype *at; 698 archetype *at;
822 object *op = get_object ();
823 699
824 if ((at = type_to_archetype (type)) == NULL) 700 if ((at = type_to_archetype (type)) == NULL)
825 { 701 {
826 LOG (llevError, "Can't clone archetype %d\n", type); 702 LOG (llevError, "Can't clone archetype %d\n", type);
827 free_object (op);
828 return NULL; 703 return 0;
829 } 704 }
830 705
831 copy_object (&at->clone, op); 706 object *op = at->clone.clone ();
832 op->instantiate (); 707 op->instantiate ();
833 return op; 708 return op;
834} 709}
835 710
836/* 711/*

Diff Legend

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