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.19 by root, Thu Sep 14 18:13:01 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-devel@real-time.com 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.
… …
75 * - the archetype found or null if nothing was found. 65 * - the archetype found or null if nothing was found.
76 */ 66 */
77archetype * 67archetype *
78find_archetype_by_object_name (const char *name) 68find_archetype_by_object_name (const char *name)
79{ 69{
80 archetype * 70 archetype *at;
81 at;
82 71
83 if (name == NULL) 72 if (name == NULL)
84 return (archetype *) NULL; 73 return (archetype *) NULL;
85 74
86 for (at = first_archetype; at != NULL; at = at->next) 75 for (at = first_archetype; at != NULL; at = at->next)
… …
97 * except that it considers only items of the given type. 86 * except that it considers only items of the given type.
98 */ 87 */
99archetype * 88archetype *
100find_archetype_by_object_type_name (int type, const char *name) 89find_archetype_by_object_type_name (int type, const char *name)
101{ 90{
102 archetype * 91 archetype *at;
103 at;
104 92
105 if (name == NULL) 93 if (name == NULL)
106 return NULL; 94 return NULL;
107 95
108 for (at = first_archetype; at != NULL; at = at->next) 96 for (at = first_archetype; at != NULL; at = at->next)
… …
120 * If type is -1, ew don't match on type. 108 * If type is -1, ew don't match on type.
121 */ 109 */
122object * 110object *
123get_archetype_by_skill_name (const char *skill, int type) 111get_archetype_by_skill_name (const char *skill, int type)
124{ 112{
125 archetype * 113 archetype *at;
126 at;
127 114
128 if (skill == NULL) 115 if (skill)
129 return NULL;
130
131 for (at = first_archetype; at != NULL; at = at->next) 116 for (at = first_archetype; at; at = at->next)
132 {
133 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)))
134 return arch_to_object (at); 118 return arch_to_object (at);
135 } 119
136 return NULL; 120 return 0;
137} 121}
138 122
139/* similiar to above - this returns the first archetype 123/* similiar to above - this returns the first archetype
140 * that matches both the type and subtype. type and subtype 124 * that matches both the type and subtype. type and subtype
141 * 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
… …
181 for (i = strlen (tmpname); i > 0; i--) 165 for (i = strlen (tmpname); i > 0; i--)
182 { 166 {
183 tmpname[i] = 0; 167 tmpname[i] = 0;
184 at = find_archetype_by_object_name (tmpname); 168 at = find_archetype_by_object_name (tmpname);
185 169
186 if (at != NULL) 170 if (at)
187 {
188 return arch_to_object (at); 171 return arch_to_object (at);
189 }
190 } 172 }
191 173
192 return create_singularity (name); 174 return create_singularity (name);
193} 175}
194 176
… …
210 * Last, make a check on the full name. 192 * Last, make a check on the full name.
211 */ 193 */
212int 194int
213item_matched_string (object *pl, object *op, const char *name) 195item_matched_string (object *pl, object *op, const char *name)
214{ 196{
215 char *
216 cp,
217 local_name[MAX_BUF]; 197 char *cp, local_name[MAX_BUF];
218 int 198 int count, retval = 0;
219 count,
220 retval = 0;
221 199
222 strcpy (local_name, name); /* strtok is destructive to name */ 200 strcpy (local_name, name); /* strtok is destructive to name */
223 201
224 for (cp = strtok (local_name, ","); cp; cp = strtok (NULL, ",")) 202 for (cp = strtok (local_name, ","); cp; cp = strtok (NULL, ","))
225 { 203 {
… …
277 retval = 15; 255 retval = 15;
278 else if (!strncasecmp (cp, query_base_name (op, 0), strlen (cp))) 256 else if (!strncasecmp (cp, query_base_name (op, 0), strlen (cp)))
279 retval = 14; 257 retval = 14;
280 else if (!strncasecmp (cp, query_base_name (op, 1), strlen (cp))) 258 else if (!strncasecmp (cp, query_base_name (op, 1), strlen (cp)))
281 retval = 14; 259 retval = 14;
282
283 /* Do substring checks, so things like 'Str+1' will match. 260 /* Do substring checks, so things like 'Str+1' will match.
284 * retval of these should perhaps be lower - they are lower 261 * retval of these should perhaps be lower - they are lower
285 * then the specific strcasecmp aboves, but still higher than 262 * then the specific strcasecmp aboves, but still higher than
286 * some other match criteria. 263 * some other match criteria.
287 */ 264 */
… …
289 retval = 12; 266 retval = 12;
290 else if (strstr (query_base_name (op, 0), cp)) 267 else if (strstr (query_base_name (op, 0), cp))
291 retval = 12; 268 retval = 12;
292 else if (strstr (query_short_name (op), cp)) 269 else if (strstr (query_short_name (op), cp))
293 retval = 12; 270 retval = 12;
294
295 /* Check against plural/non plural based on count. */ 271 /* Check against plural/non plural based on count. */
296 else if (count > 1 && !strcasecmp (cp, op->name_pl)) 272 else if (count > 1 && !strcasecmp (cp, op->name_pl))
297 {
298 retval = 6; 273 retval = 6;
299 }
300 else if (count == 1 && !strcasecmp (op->name, cp)) 274 else if (count == 1 && !strcasecmp (op->name, cp))
301 {
302 retval = 6; 275 retval = 6;
303 }
304 /* base name matched - not bad */ 276 /* base name matched - not bad */
305 else if (strcasecmp (cp, op->name) == 0 && !count) 277 else if (strcasecmp (cp, op->name) == 0 && !count)
306 retval = 4; 278 retval = 4;
307 /* Check for partial custom name, but give a real low priority */ 279 /* Check for partial custom name, but give a real low priority */
308 else if (op->custom_name && strstr (op->custom_name, cp)) 280 else if (op->custom_name && strstr (op->custom_name, cp))
… …
310 282
311 if (retval) 283 if (retval)
312 { 284 {
313 if (pl->type == PLAYER) 285 if (pl->type == PLAYER)
314 pl->contr->count = count; 286 pl->contr->count = count;
287
315 return retval; 288 return retval;
316 } 289 }
317 } 290 }
291
318 return 0; 292 return 0;
319} 293}
320 294
321/* 295/*
322 * Initialises the internal linked list of archetypes (read from file). 296 * Initialises the internal linked list of archetypes (read from file).
… …
327void 301void
328init_archetypes (void) 302init_archetypes (void)
329{ /* called from add_player() and edit() */ 303{ /* called from add_player() and edit() */
330 if (first_archetype != NULL) /* Only do this once */ 304 if (first_archetype != NULL) /* Only do this once */
331 return; 305 return;
306
332 arch_init = 1; 307 arch_init = 1;
333 load_archetypes (); 308 load_archetypes ();
334 arch_init = 0; 309 arch_init = 0;
335 empty_archetype = find_archetype ("empty_archetype"); 310 empty_archetype = archetype::find ("empty_archetype");
336 311
337/* init_blocksview();*/ 312/* init_blocksview();*/
338} 313}
339 314
340/* 315/*
341 * Stores debug-information about how efficient the hashtable
342 * used for archetypes has been in the static errmsg array.
343 */
344
345void
346arch_info (object *op)
347{
348 sprintf (errmsg, "%d searches and %d strcmp()'s", arch_search, arch_cmp);
349 new_draw_info (NDI_BLACK, 0, op, errmsg);
350}
351
352/*
353 * Initialise the hashtable used by the archetypes.
354 */
355
356void
357clear_archetable (void)
358{
359 memset ((void *) arch_table, 0, ARCHTABLE * sizeof (archetype *));
360}
361
362/*
363 * 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_...
364 */ 317 */
365
366void 318void
367init_archetable (void) 319init_archetable (void)
368{ 320{
369 archetype * 321 archetype *at;
370 at;
371 322
372 LOG (llevDebug, " Setting up archetable...\n"); 323 LOG (llevDebug, " Setting up archetable...\n");
373 324
374 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)
375 add_arch (at); 326 at->hash_add ();
376 327
377 LOG (llevDebug, "done\n"); 328 LOG (llevDebug, "done\n");
378} 329}
379 330
380/*
381 * Dumps an archetype to debug-level output.
382 */
383
384void
385dump_arch (archetype *at)
386{
387 dump_object (&at->clone);
388}
389
390/*
391 * Dumps _all_ archetypes to debug-level output.
392 * If you run crossfire with debug, and enter DM-mode, you can trigger
393 * this with the O key.
394 */
395
396void
397dump_all_archetypes (void)
398{
399 archetype *
400 at;
401
402 for (at = first_archetype; at != NULL; at = (at->more == NULL) ? at->next : at->more)
403 {
404 dump_arch (at);
405 fprintf (logfile, "%s\n", errmsg);
406 }
407}
408
409void 331void
410free_all_archs (void) 332free_all_archs (void)
411{ 333{
412 archetype * 334 archetype *at, *next;
413 at, *
414 next;
415 int
416 i = 0, f = 0; 335 int i = 0, f = 0;
417 336
418 for (at = first_archetype; at != NULL; at = next) 337 for (at = first_archetype; at; at = next)
419 { 338 {
420 if (at->more) 339 if (at->more)
421 next = at->more; 340 next = at->more;
422 else 341 else
423 next = at->next; 342 next = at->next;
… …
425 delete 344 delete
426 at; 345 at;
427 346
428 i++; 347 i++;
429 } 348 }
349
430 LOG (llevDebug, "Freed %d archetypes, %d faces\n", i, f); 350 LOG (llevDebug, "Freed %d archetypes, %d faces\n", i, f);
431} 351}
432 352
433archetype::archetype () 353archetype::archetype ()
434{ 354{
435 clear_object (&clone); /* to initial state other also */
436 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 */
437 SET_FLAG (&clone, FLAG_REMOVED); /* doesn't copy these flags... */ 356 SET_FLAG (&clone, FLAG_REMOVED); /* doesn't copy these flags... */
438} 357}
439 358
440archetype::~archetype () 359archetype::~archetype ()
441{ 360{
… …
446 * of archetype-structures. 365 * of archetype-structures.
447 */ 366 */
448void 367void
449first_arch_pass (object_thawer & fp) 368first_arch_pass (object_thawer & fp)
450{ 369{
451 archetype * 370 archetype *head = 0, *last_more = 0;
452 at, *
453 head = NULL, *last_more = NULL;
454 371
372 archetype *at = new archetype;
455 at->clone.arch = first_archetype = at = new archetype; 373 at->clone.arch = first_archetype = at;
456 374
457 while (int i = load_object (fp, &at->clone, 0)) 375 while (int i = load_object (fp, &at->clone, 0))
458 { 376 {
459 at->clone.speed_left = (float) (-0.1); 377 at->clone.speed_left = (float) (-0.1);
460 /* 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
… …
527 */ 445 */
528 446
529void 447void
530second_arch_pass (object_thawer & thawer) 448second_arch_pass (object_thawer & thawer)
531{ 449{
532 char
533 buf[MAX_BUF], *
534 variable = buf, *argument, *cp; 450 char buf[MAX_BUF], *variable = buf, *argument, *cp;
535 archetype *
536 at = NULL, *other; 451 archetype *at = NULL, *other;
537 452
538 while (fgets (buf, MAX_BUF, thawer) != NULL) 453 while (fgets (buf, MAX_BUF, thawer) != NULL)
539 { 454 {
540 if (*buf == '#') 455 if (*buf == '#')
541 continue; 456 continue;
… …
549 cp--; 464 cp--;
550 } 465 }
551 } 466 }
552 if (!strcmp ("Object", variable)) 467 if (!strcmp ("Object", variable))
553 { 468 {
554 if ((at = find_archetype (argument)) == NULL) 469 if ((at = archetype::find (argument)) == NULL)
555 LOG (llevError, "Warning: failed to find arch %s\n", argument); 470 LOG (llevError, "Warning: failed to find arch %s\n", argument);
556 } 471 }
557 else if (!strcmp ("other_arch", variable)) 472 else if (!strcmp ("other_arch", variable))
558 { 473 {
559 if (at != NULL && at->clone.other_arch == NULL) 474 if (at != NULL && at->clone.other_arch == NULL)
560 { 475 {
561 if ((other = find_archetype (argument)) == NULL) 476 if ((other = archetype::find (argument)) == NULL)
562 LOG (llevError, "Warning: failed to find other_arch %s\n", argument); 477 LOG (llevError, "Warning: failed to find other_arch %s\n", argument);
563 else if (at != NULL) 478 else if (at != NULL)
564 at->clone.other_arch = other; 479 at->clone.other_arch = other;
565 } 480 }
566 } 481 }
567 else if (!strcmp ("randomitems", variable)) 482 else if (!strcmp ("randomitems", variable))
568 { 483 {
569 if (at != NULL) 484 if (at != NULL)
570 { 485 {
571 treasurelist *
572 tl = find_treasurelist (argument); 486 treasurelist *tl = find_treasurelist (argument);
573 487
574 if (tl == NULL) 488 if (tl == NULL)
575 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);
576 else 490 else
577 at->clone.randomitems = tl; 491 at->clone.randomitems = tl;
… …
582 496
583#ifdef DEBUG 497#ifdef DEBUG
584void 498void
585check_generators (void) 499check_generators (void)
586{ 500{
587 archetype * 501 archetype *at;
588 at;
589 502
590 for (at = first_archetype; at != NULL; at = at->next) 503 for (at = first_archetype; at != NULL; at = at->next)
591 if (QUERY_FLAG (&at->clone, FLAG_GENERATOR) && at->clone.other_arch == NULL) 504 if (QUERY_FLAG (&at->clone, FLAG_GENERATOR) && at->clone.other_arch == NULL)
592 LOG (llevError, "Warning: %s is generator but lacks other_arch.\n", &at->name); 505 LOG (llevError, "Warning: %s is generator but lacks other_arch.\n", &at->name);
593} 506}
… …
601 */ 514 */
602 515
603void 516void
604load_archetypes (void) 517load_archetypes (void)
605{ 518{
606 char
607 filename[MAX_BUF]; 519 char filename[MAX_BUF];
608
609#if TIME_ARCH_LOAD
610 struct timeval
611 tv1,
612 tv2;
613#endif
614 520
615 sprintf (filename, "%s/%s", settings.datadir, settings.archetypes); 521 sprintf (filename, "%s/%s", settings.datadir, settings.archetypes);
616 LOG (llevDebug, "Reading archetypes from %s:\n", filename); 522 LOG (llevDebug, "Reading archetypes from %s:\n", filename);
617 523
618 { 524 {
619 object_thawer 525 object_thawer
620 thawer (filename); 526 thawer (filename);
621 527
622 clear_archetable ();
623 LOG (llevDebug, " arch-pass 1...\n"); 528 LOG (llevDebug, " arch-pass 1...\n");
624 first_arch_pass (thawer); 529 first_arch_pass (thawer);
625 LOG (llevDebug, " done\n"); 530 LOG (llevDebug, " done\n");
626 } 531 }
627 532
… …
632 object_thawer 537 object_thawer
633 thawer (filename); 538 thawer (filename);
634 539
635 LOG (llevDebug, " loading treasure...\n"); 540 LOG (llevDebug, " loading treasure...\n");
636 load_treasures (); 541 load_treasures ();
542 LOG (llevDebug, " done\n");
637 LOG (llevDebug, " done\n arch-pass 2...\n"); 543 LOG (llevDebug, " arch-pass 2...\n");
638 second_arch_pass (thawer); 544 second_arch_pass (thawer);
639 LOG (llevDebug, " done\n"); 545 LOG (llevDebug, " done\n");
640#ifdef DEBUG 546#ifdef DEBUG
641 check_generators (); 547 check_generators ();
642#endif 548#endif
… …
646 552
647/* 553/*
648 * 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.
649 * This function returns NULL on failure. 555 * This function returns NULL on failure.
650 */ 556 */
651
652object * 557object *
653arch_to_object (archetype *at) 558arch_to_object (archetype *at)
654{ 559{
655 object * 560 object *op;
656 op;
657 561
658 if (at == NULL) 562 if (at == NULL)
659 { 563 {
660 if (warn_archetypes) 564 if (warn_archetypes)
661 LOG (llevError, "Couldn't find archetype.\n"); 565 LOG (llevError, "Couldn't find archetype.\n");
662 566
663 return NULL; 567 return NULL;
664 } 568 }
665 569
666 op = get_object (); 570 op = at->clone.clone ();
667 copy_object (&at->clone, op);
668 op->arch = at; 571 op->arch = at;
669 op->instantiate (); 572 op->instantiate ();
670 return op; 573 return op;
671} 574}
672 575
… …
674 * Creates an object. This function is called by get_archetype() 577 * Creates an object. This function is called by get_archetype()
675 * if it fails to find the appropriate archetype. 578 * if it fails to find the appropriate archetype.
676 * Thus get_archetype() will be guaranteed to always return 579 * Thus get_archetype() will be guaranteed to always return
677 * an object, and never NULL. 580 * an object, and never NULL.
678 */ 581 */
679
680object * 582object *
681create_singularity (const char *name) 583create_singularity (const char *name)
682{ 584{
683 object * 585 object *op;
684 op;
685 char
686 buf[MAX_BUF]; 586 char buf[MAX_BUF];
687 587
688 sprintf (buf, "%s (%s)", ARCH_SINGULARITY, name); 588 sprintf (buf, "%s (%s)", ARCH_SINGULARITY, name);
689 op = get_object (); 589 op = object::create ();
690 op->name = op->name_pl = buf; 590 op->name = op->name_pl = buf;
691 SET_FLAG (op, FLAG_NO_PICK); 591 SET_FLAG (op, FLAG_NO_PICK);
692 return op; 592 return op;
693} 593}
694 594
695/* 595/*
696 * Finds which archetype matches the given name, and returns a new 596 * Finds which archetype matches the given name, and returns a new
697 * object containing a copy of the archetype. 597 * object containing a copy of the archetype.
698 */ 598 */
699
700object * 599object *
701get_archetype (const char *name) 600get_archetype (const char *name)
702{ 601{
703 archetype * 602 archetype *at = archetype::find (name);
704 at;
705 603
706 at = find_archetype (name); 604 if (!at)
707 if (at == NULL)
708 return create_singularity (name); 605 return create_singularity (name);
709 606
710 return arch_to_object (at); 607 return arch_to_object (at);
711} 608}
712 609
… …
715 */ 612 */
716 613
717unsigned long 614unsigned long
718hasharch (const char *str, int tablesize) 615hasharch (const char *str, int tablesize)
719{ 616{
720 unsigned long 617 unsigned long hash = 0;
721 hash = 0;
722 unsigned int 618 unsigned int i = 0;
723 i = 0;
724 const char * 619 const char *p;
725 p;
726 620
727 /* use the one-at-a-time hash function, which supposedly is 621 /* use the one-at-a-time hash function, which supposedly is
728 * better than the djb2-like one used by perl5.005, but 622 * better than the djb2-like one used by perl5.005, but
729 * certainly is better then the bug used here before. 623 * certainly is better then the bug used here before.
730 * see http://burtleburtle.net/bob/hash/doobs.html 624 * see http://burtleburtle.net/bob/hash/doobs.html
… …
745 639
746/* 640/*
747 * Finds, using the hashtable, which archetype matches the given name. 641 * Finds, using the hashtable, which archetype matches the given name.
748 * returns a pointer to the found archetype, otherwise NULL. 642 * returns a pointer to the found archetype, otherwise NULL.
749 */ 643 */
750
751archetype * 644archetype *
752find_archetype (const char *name) 645archetype::find (const char *name)
753{ 646{
754#if USE_UNORDERED_MAP
755 name = shstr::find (name);
756
757 if (!name) 647 if (!name)
758 return 0; 648 return 0;
759 649
760 AUTODECL (i, ht.find ((size_t) name)); 650 AUTODECL (i, ht.find (name));
761 651
762 if (i == ht.end ()) 652 if (i == ht.end ())
763 return 0; 653 return 0;
764 else 654 else
765 return i->second; 655 return i->second;
766#endif
767
768 archetype *
769 at;
770 unsigned long
771 index;
772
773 if (name == NULL)
774 return (archetype *) NULL;
775
776 index = hasharch (name, ARCHTABLE);
777 arch_search++;
778 for (;;)
779 {
780 at = arch_table[index];
781 if (at == NULL)
782 {
783 if (warn_archetypes)
784 LOG (llevError, "Couldn't find archetype %s\n", name);
785 return NULL;
786 }
787 arch_cmp++;
788 if (!strcmp ((const char *) at->name, name))
789 return at;
790 if (++index >= ARCHTABLE)
791 index = 0;
792 }
793} 656}
794 657
795/* 658/*
796 * Adds an archetype to the hashtable. 659 * Adds an archetype to the hashtable.
797 */ 660 */
798 661void
799static void 662archetype::hash_add ()
800add_arch (archetype *at)
801{ 663{
802#if USE_UNORDERED_MAP 664 ht.insert (std::make_pair (name, this));
803 ht.insert (std::make_pair ((size_t) (const char *) at->name, at)); 665}
804#endif
805 666
806 int 667void
807 index = hasharch ((const char *) at->name, ARCHTABLE), org_index = index; 668archetype::hash_del ()
808 669{
809 for (;;) 670 ht.erase (name);
810 {
811 if (arch_table[index] == NULL)
812 {
813 arch_table[index] = at;
814 return;
815 }
816
817 if (++index == ARCHTABLE)
818 index = 0;
819
820 if (index == org_index)
821 fatal (ARCHTABLE_TOO_SMALL);
822 }
823} 671}
824 672
825/* 673/*
826 * Returns the first archetype using the given type. 674 * Returns the first archetype using the given type.
827 * Used in treasure-generation. 675 * Used in treasure-generation.
828 */ 676 */
829
830archetype * 677archetype *
831type_to_archetype (int type) 678type_to_archetype (int type)
832{ 679{
833 archetype * 680 archetype *at;
834 at;
835 681
836 for (at = first_archetype; at != NULL; at = (at->more == NULL) ? at->next : at->more) 682 for (at = first_archetype; at; at = at->more == 0 ? at->next : at->more)
837 if (at->clone.type == type) 683 if (at->clone.type == type)
838 return at; 684 return at;
685
839 return NULL; 686 return 0;
840} 687}
841 688
842/* 689/*
843 * Returns a new object copied from the first archetype matching 690 * Returns a new object copied from the first archetype matching
844 * the given type. 691 * the given type.
… …
846 */ 693 */
847 694
848object * 695object *
849clone_arch (int type) 696clone_arch (int type)
850{ 697{
851 archetype * 698 archetype *at;
852 at;
853 object *
854 op = get_object ();
855 699
856 if ((at = type_to_archetype (type)) == NULL) 700 if ((at = type_to_archetype (type)) == NULL)
857 { 701 {
858 LOG (llevError, "Can't clone archetype %d\n", type); 702 LOG (llevError, "Can't clone archetype %d\n", type);
859 free_object (op);
860 return NULL; 703 return 0;
861 } 704 }
862 copy_object (&at->clone, op); 705
706 object *op = at->clone.clone ();
863 op->instantiate (); 707 op->instantiate ();
864 return op; 708 return op;
865} 709}
866 710
867/* 711/*
… …
869 */ 713 */
870 714
871object * 715object *
872object_create_arch (archetype *at) 716object_create_arch (archetype *at)
873{ 717{
874 object * 718 object *op, *prev = 0, *head = 0;
875 op, *
876 prev = NULL, *head = NULL;
877 719
878 while (at) 720 while (at)
879 { 721 {
880 op = arch_to_object (at); 722 op = arch_to_object (at);
881 op->x = at->clone.x; 723 op->x = at->clone.x;
882 op->y = at->clone.y; 724 op->y = at->clone.y;
725
883 if (head) 726 if (head)
884 op->head = head, prev->more = op; 727 op->head = head, prev->more = op;
728
885 if (!head) 729 if (!head)
886 head = op; 730 head = op;
731
887 prev = op; 732 prev = op;
888 at = at->more; 733 at = at->more;
889 } 734 }
735
890 return (head); 736 return (head);
891} 737}
892 738
893/*** end of arch.c ***/

Diff Legend

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