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.43 by root, Fri Feb 16 19:43:40 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.
… …
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 *at; 70 shstr_cmp name_cmp (name);
81 71
82 if (name == NULL)
83 return (archetype *) NULL;
84
85 for (at = first_archetype; at != NULL; at = at->next) 72 for (archetype *at = first_archetype; at; at = at->next)
86 { 73 if (at->clone.name == name_cmp)
87 if (!strcmp (at->clone.name, name))
88 return at; 74 return at;
89 } 75
90 return NULL; 76 return 0;
91} 77}
92 78
93/** 79/**
94 * This function retrieves an archetype by type and name that appears during 80 * This function retrieves an archetype by type and name that appears during
95 * the game. It is basically the same as find_archetype_by_object_name() 81 * the game. It is basically the same as find_archetype_by_object_name()
96 * except that it considers only items of the given type. 82 * except that it considers only items of the given type.
97 */ 83 */
98archetype * 84archetype *
99find_archetype_by_object_type_name (int type, const char *name) 85find_archetype_by_object_type_name (int type, const char *name)
100{ 86{
101 archetype *at; 87 shstr_cmp name_cmp (name);
102 88
103 if (name == NULL)
104 return NULL;
105
106 for (at = first_archetype; at != NULL; at = at->next) 89 for (archetype *at = first_archetype; at; at = at->next)
107 { 90 if (at->clone.name == name_cmp && at->clone.type == type)
108 if (at->clone.type == type && strcmp (at->clone.name, name) == 0)
109 return at; 91 return at;
110 }
111 92
112 return NULL; 93 return 0;
113} 94}
114 95
115/* This is a lot like the above function. Instead, we are trying to match 96/* This is a lot like the above function. Instead, we are trying to match
116 * the arch->skill values. type is the type of object to match 97 * the arch->skill values. type is the type of object to match
117 * against (eg, to only match against skills or only skill objects for example). 98 * against (eg, to only match against skills or only skill objects for example).
118 * If type is -1, ew don't match on type. 99 * If type is -1, ew don't match on type.
119 */ 100 */
120object * 101object *
121get_archetype_by_skill_name (const char *skill, int type) 102get_archetype_by_skill_name (const char *skill, int type)
122{ 103{
123 archetype * 104 shstr_cmp skill_cmp (skill);
124 at;
125 105
126 if (skill == NULL)
127 return NULL;
128
129 for (at = first_archetype; at != NULL; at = at->next) 106 for (archetype *at = first_archetype; at; at = at->next)
130 { 107 if (at->clone.skill == skill_cmp && (type == -1 || type == at->clone.type))
131 if (((type == -1) || (type == at->clone.type)) && (!strcmp (at->clone.skill, skill)))
132 return arch_to_object (at); 108 return arch_to_object (at);
133 } 109
134 return NULL; 110 return 0;
135} 111}
136 112
137/* similiar to above - this returns the first archetype 113/* similiar to above - this returns the first archetype
138 * that matches both the type and subtype. type and subtype 114 * 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 115 * can be -1 to say ignore, but in this case, the match it does
… …
142 * (eg, skills) 118 * (eg, skills)
143 */ 119 */
144archetype * 120archetype *
145get_archetype_by_type_subtype (int type, int subtype) 121get_archetype_by_type_subtype (int type, int subtype)
146{ 122{
147 archetype *
148 at;
149
150 for (at = first_archetype; at != NULL; at = at->next) 123 for (archetype *at = first_archetype; at; at = at->next)
151 {
152 if (((type == -1) || (type == at->clone.type)) && (subtype == -1 || subtype == at->clone.subtype)) 124 if ((type == -1 || type == at->clone.type) && (subtype == -1 || subtype == at->clone.subtype))
153 return at; 125 return at;
154 } 126
155 return NULL; 127 return 0;
156} 128}
157 129
158/** 130/**
159 * GROS - this returns a new object given the name that appears during the game 131 * GROS - this returns a new object given the name that appears during the game
160 * (for example, "writing pen" instead of "stylus"). 132 * (for example, "writing pen" instead of "stylus").
… …
168 * but it otherwise had a big memory leak. 140 * but it otherwise had a big memory leak.
169 */ 141 */
170object * 142object *
171get_archetype_by_object_name (const char *name) 143get_archetype_by_object_name (const char *name)
172{ 144{
173 archetype *at;
174 char tmpname[MAX_BUF]; 145 char tmpname[MAX_BUF];
175 int i; 146 int i;
176 147
177 assign (tmpname, name); 148 assign (tmpname, name);
178 149
179 for (i = strlen (tmpname); i > 0; i--) 150 for (i = strlen (tmpname); i > 0; i--)
180 { 151 {
181 tmpname[i] = 0; 152 tmpname[i] = 0;
153
182 at = find_archetype_by_object_name (tmpname); 154 if (archetype *at = find_archetype_by_object_name (tmpname))
183
184 if (at != NULL)
185 return arch_to_object (at); 155 return arch_to_object (at);
186 } 156 }
187 157
188 return create_singularity (name); 158 return create_singularity (name);
189} 159}
… …
209item_matched_string (object *pl, object *op, const char *name) 179item_matched_string (object *pl, object *op, const char *name)
210{ 180{
211 char *cp, local_name[MAX_BUF]; 181 char *cp, local_name[MAX_BUF];
212 int count, retval = 0; 182 int count, retval = 0;
213 183
214 strcpy (local_name, name); /* strtok is destructive to name */ 184 assign (local_name, name); /* strtok is destructive to name */
215 185
216 for (cp = strtok (local_name, ","); cp; cp = strtok (NULL, ",")) 186 for (cp = strtok (local_name, ","); cp; cp = strtok (NULL, ","))
217 { 187 {
218 while (cp[0] == ' ') 188 while (cp[0] == ' ')
219 ++cp; /* get rid of spaces */ 189 ++cp; /* get rid of spaces */
… …
325 295
326/* init_blocksview();*/ 296/* init_blocksview();*/
327} 297}
328 298
329/* 299/*
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_... 300 * An alternative way to init the hashtable which is slower, but _works_...
353 */ 301 */
354
355void 302void
356init_archetable (void) 303init_archetable (void)
357{ 304{
358 archetype *at;
359
360 LOG (llevDebug, " Setting up archetable...\n"); 305 LOG (llevDebug, " Setting up archetable...\n");
361 306
362 for (at = first_archetype; at != NULL; at = (at->more == NULL) ? at->next : at->more) 307 for (archetype *at = first_archetype; at; at = at->next)
363 add_arch (at); 308 for (archetype *bt = at; bt; bt = bt->more)
309 bt->hash_add ();
364 310
365 LOG (llevDebug, "done\n"); 311 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} 312}
395 313
396void 314void
397free_all_archs (void) 315free_all_archs (void)
398{ 316{
399 archetype *at, *next; 317 archetype *at, *next;
400 int i = 0, f = 0; 318 int i = 0, f = 0;
401 319
402 for (at = first_archetype; at != NULL; at = next) 320 for (at = first_archetype; at; at = next)
403 { 321 {
404 if (at->more) 322 if (at->more)
405 next = at->more; 323 next = at->more;
406 else 324 else
407 next = at->next; 325 next = at->next;
… …
409 delete 327 delete
410 at; 328 at;
411 329
412 i++; 330 i++;
413 } 331 }
332
414 LOG (llevDebug, "Freed %d archetypes, %d faces\n", i, f); 333 LOG (llevDebug, "Freed %d archetypes, %d faces\n", i, f);
415} 334}
416 335
417archetype::archetype () 336archetype::archetype ()
418{ 337{
419 clear_object (&clone); /* to initial state other also */ 338 clone.arch = this;
339
420 CLEAR_FLAG (&clone, FLAG_FREED); /* This shouldn't matter, since copy_object() */ 340 CLEAR_FLAG (&clone, FLAG_FREED); /* This shouldn't matter, since copy_to */
421 SET_FLAG (&clone, FLAG_REMOVED); /* doesn't copy these flags... */ 341 SET_FLAG (&clone, FLAG_REMOVED); /* doesn't copy these flags... */
422} 342}
423 343
424archetype::~archetype () 344archetype::~archetype ()
425{ 345{
346 //TODO: nuke ->more's
347}
348
349archetype *
350archetype::read (object_thawer &f)
351{
352 assert (f.kw == KW_object);
353
354 archetype *head = new archetype;
355 f.get (head->name);
356
357 if (!head->clone.parse_kv (f))
358 {
359 delete head;
360 return 0;
361 }
362
363 for (archetype *prev = head; f.kw == KW_more; )
364 {
365 f.next ();
366
367 assert (f.kw == KW_object);
368
369 archetype *more = new archetype;
370 f.get (more->name);
371
372 if (!more->clone.parse_kv (f))
373 {
374 delete head;
375 return 0;
376 }
377
378 assert (("pippijn sagt es gibt keine tiles mehr", head->clone.face == more->clone.face));
379
380 if (more->clone.x > head->tail_x) head->tail_x = more->clone.x;
381 if (more->clone.y > head->tail_y) head->tail_y = more->clone.y;
382
383 more->head = head;
384 more->clone.head = &head->clone;
385 prev->more = more;
386 prev->clone.more = &more->clone;
387
388 prev = more;
389 }
390
391 head->next = first_archetype;
392 first_archetype = head;
393
394 return head;
426} 395}
427 396
428/* 397/*
429 * Reads/parses the archetype-file, and copies into a linked list 398 * Reads/parses the archetype-file, and copies into a linked list
430 * of archetype-structures. 399 * of archetype-structures.
431 */ 400 */
432void 401static bool
433first_arch_pass (object_thawer & fp) 402first_arch_pass (object_thawer &f)
434{ 403{
435 archetype *at, *head = NULL, *last_more = NULL; 404 for (;;)
436
437 at->clone.arch = first_archetype = at = new archetype;
438
439 while (int i = load_object (fp, &at->clone, 0))
440 { 405 {
441 at->clone.speed_left = (float) (-0.1);
442 /* copy the body_info to the body_used - this is only really
443 * need for monsters, but doesn't hurt to do it for everything.
444 * by doing so, when a monster is created, it has good starting
445 * values for the body_used info, so when items are created
446 * for it, they can be properly equipped.
447 */
448 memcpy (&at->clone.body_used, &at->clone.body_info, sizeof (at->clone.body_info));
449
450 switch (i) 406 switch (f.kw)
451 {
452 case LL_NORMAL: /* A new archetype, just link it with the previous */
453 if (last_more != NULL)
454 last_more->next = at;
455 if (head != NULL)
456 head->next = at;
457 head = last_more = at;
458#if 0
459 if (!op->type)
460 LOG (llevDebug, " WARNING: Archetype %s has no type info!\n", op->arch->name);
461#endif
462 at->tail_x = 0;
463 at->tail_y = 0;
464 break;
465
466 case LL_MORE: /* Another part of the previous archetype, link it correctly */
467
468 at->head = head;
469 at->clone.head = &head->clone;
470 if (last_more != NULL)
471 {
472 last_more->more = at;
473 last_more->clone.more = &at->clone;
474 }
475 last_more = at;
476
477 /* If this multipart image is still composed of individual small
478 * images, don't set the tail_.. values. We can't use them anyways,
479 * and setting these to zero makes the map sending to the client much
480 * easier as just looking at the head, we know what to do.
481 */
482 if (at->clone.face != head->clone.face)
483 {
484 head->tail_x = 0;
485 head->tail_y = 0;
486 }
487 else
488 {
489 if (at->clone.x > head->tail_x)
490 head->tail_x = at->clone.x;
491 if (at->clone.y > head->tail_y)
492 head->tail_y = at->clone.y;
493 }
494 break;
495
496 } 407 {
408 case KW_object:
409 if (!archetype::read (f))
410 return false;
411 continue;
497 412
498 at = new archetype; 413 case KW_EOF:
414 return true;
499 415
500 at->clone.arch = at; 416 default:
501 } 417 if (!f.parse_error ("archetypes file"))
418 return false;
419 }
502 420
503 delete at; 421 f.next ();
422 }
504} 423}
505 424
506/* 425/*
507 * Reads the archetype file once more, and links all pointers between 426 * Reads the archetype file once more, and links all pointers between
508 * archetypes. 427 * archetypes.
509 */ 428 */
510
511void 429void
512second_arch_pass (object_thawer & thawer) 430second_arch_pass (object_thawer & thawer)
513{ 431{
514 char buf[MAX_BUF], *variable = buf, *argument, *cp; 432 char buf[MAX_BUF], *variable = buf, *argument, *cp;
515 archetype *at = NULL, *other; 433 archetype *at = NULL, *other;
516 434
517 while (fgets (buf, MAX_BUF, thawer) != NULL) 435 while (fgets (buf, MAX_BUF, thawer) != NULL)
518 { 436 {
519 if (*buf == '#') 437 if (*buf == '#')
520 continue; 438 continue;
439
521 if ((argument = strchr (buf, ' ')) != NULL) 440 if ((argument = strchr (buf, ' ')) != NULL)
522 { 441 {
523 *argument = '\0', argument++; 442 *argument = '\0', argument++;
524 cp = argument + strlen (argument) - 1; 443 cp = argument + strlen (argument) - 1;
525 while (isspace (*cp)) 444 while (isspace (*cp))
526 { 445 {
527 *cp = '\0'; 446 *cp = '\0';
528 cp--; 447 cp--;
529 } 448 }
530 } 449 }
450
531 if (!strcmp ("Object", variable)) 451 if (!strcmp ("object", variable))
532 { 452 {
533 if ((at = archetype::find (argument)) == NULL) 453 if ((at = archetype::find (argument)) == NULL)
534 LOG (llevError, "Warning: failed to find arch %s\n", argument); 454 LOG (llevError, "Warning: failed to find arch %s\n", argument);
535 } 455 }
536 else if (!strcmp ("other_arch", variable)) 456 else if (!strcmp ("other_arch", variable))
… …
543 at->clone.other_arch = other; 463 at->clone.other_arch = other;
544 } 464 }
545 } 465 }
546 else if (!strcmp ("randomitems", variable)) 466 else if (!strcmp ("randomitems", variable))
547 { 467 {
548 if (at != NULL) 468 if (at)
549 { 469 {
550 treasurelist *tl = find_treasurelist (argument); 470 treasurelist *tl = find_treasurelist (argument);
551 471
552 if (tl == NULL) 472 if (tl == NULL)
553 LOG (llevError, "Failed to link treasure to arch (%s): %s\n", &at->name, argument); 473 LOG (llevError, "Failed to link treasure to arch (%s): %s\n", &at->name, argument);
… …
580void 500void
581load_archetypes (void) 501load_archetypes (void)
582{ 502{
583 char filename[MAX_BUF]; 503 char filename[MAX_BUF];
584 504
585#if TIME_ARCH_LOAD
586 struct timeval
587 tv1,
588 tv2;
589#endif
590
591 sprintf (filename, "%s/%s", settings.datadir, settings.archetypes); 505 sprintf (filename, "%s/%s", settings.datadir, settings.archetypes);
592 LOG (llevDebug, "Reading archetypes from %s:\n", filename); 506 LOG (llevDebug, "Reading archetypes from %s:\n", filename);
593 507
594 { 508 {
595 object_thawer
596 thawer (filename); 509 object_thawer f (filename);
597 510
598 clear_archetable (); 511 f.next ();
512
599 LOG (llevDebug, " arch-pass 1...\n"); 513 LOG (llevDebug, " arch-pass 1...\n");
600 first_arch_pass (thawer); 514 if (!first_arch_pass (f))
515 cleanup ("errors during first arch pass are fatal");
601 LOG (llevDebug, " done\n"); 516 LOG (llevDebug, " done\n");
602 } 517 }
603 518
604 init_archetable (); 519 init_archetable ();
605 warn_archetypes = 1; 520 warn_archetypes = 1;
606 521
607 { 522 {
608 object_thawer
609 thawer (filename); 523 object_thawer f (filename);
610 524
611 LOG (llevDebug, " loading treasure...\n"); 525 LOG (llevDebug, " loading treasure...\n");
612 load_treasures (); 526 load_treasures ();
527 LOG (llevDebug, " done\n");
613 LOG (llevDebug, " done\n arch-pass 2...\n"); 528 LOG (llevDebug, " arch-pass 2...\n");
614 second_arch_pass (thawer); 529 second_arch_pass (f);
615 LOG (llevDebug, " done\n"); 530 LOG (llevDebug, " done\n");
616#ifdef DEBUG 531#ifdef DEBUG
617 check_generators (); 532 check_generators ();
618#endif 533#endif
619 } 534 }
… …
622 537
623/* 538/*
624 * Creates and returns a new object which is a copy of the given archetype. 539 * Creates and returns a new object which is a copy of the given archetype.
625 * This function returns NULL on failure. 540 * This function returns NULL on failure.
626 */ 541 */
627
628object * 542object *
629arch_to_object (archetype *at) 543arch_to_object (archetype *at)
630{ 544{
631 object *op; 545 if (!at)
632
633 if (at == NULL)
634 { 546 {
635 if (warn_archetypes) 547 if (warn_archetypes)
636 LOG (llevError, "Couldn't find archetype.\n"); 548 LOG (llevError, "Couldn't find archetype.\n");
637 549
638 return NULL; 550 return NULL;
639 } 551 }
640 552
641 op = get_object (); 553 object *op = at->clone.clone ();
642 copy_object (&at->clone, op);
643 op->arch = at; 554 op->arch = at;
644 op->instantiate (); 555 op->instantiate ();
645 return op; 556 return op;
646} 557}
647 558
… …
649 * Creates an object. This function is called by get_archetype() 560 * Creates an object. This function is called by get_archetype()
650 * if it fails to find the appropriate archetype. 561 * if it fails to find the appropriate archetype.
651 * Thus get_archetype() will be guaranteed to always return 562 * Thus get_archetype() will be guaranteed to always return
652 * an object, and never NULL. 563 * an object, and never NULL.
653 */ 564 */
654
655object * 565object *
656create_singularity (const char *name) 566create_singularity (const char *name)
657{ 567{
658 object *op; 568 object *op;
659 char buf[MAX_BUF]; 569 char buf[MAX_BUF];
660 570
661 sprintf (buf, "%s (%s)", ARCH_SINGULARITY, name); 571 sprintf (buf, "%s (%s)", ARCH_SINGULARITY, name);
662 op = get_object (); 572 op = object::create ();
663 op->name = op->name_pl = buf; 573 op->name = op->name_pl = buf;
664 SET_FLAG (op, FLAG_NO_PICK); 574 SET_FLAG (op, FLAG_NO_PICK);
665 return op; 575 return op;
666} 576}
667 577
668/* 578/*
669 * Finds which archetype matches the given name, and returns a new 579 * Finds which archetype matches the given name, and returns a new
670 * object containing a copy of the archetype. 580 * object containing a copy of the archetype.
671 */ 581 */
672
673object * 582object *
674get_archetype (const char *name) 583get_archetype (const char *name)
675{ 584{
676 archetype *at = archetype::find (name); 585 archetype *at = archetype::find (name);
677 586
… …
713 622
714/* 623/*
715 * Finds, using the hashtable, which archetype matches the given name. 624 * Finds, using the hashtable, which archetype matches the given name.
716 * returns a pointer to the found archetype, otherwise NULL. 625 * returns a pointer to the found archetype, otherwise NULL.
717 */ 626 */
718
719archetype * 627archetype *
720archetype::find (const char *name) 628archetype::find (const char *name)
721{ 629{
722 if (!name) 630 if (!name)
723 return 0; 631 return 0;
724 632
725#if USE_UNORDERED_MAP
726 AUTODECL (i, ht.find ((size_t) name)); 633 AUTODECL (i, ht.find (name));
727 634
728 if (i == ht.end ()) 635 if (i == ht.end ())
729 return 0; 636 return 0;
730 else 637 else
731 return i->second; 638 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} 639}
760 640
761/* 641/*
762 * Adds an archetype to the hashtable. 642 * Adds an archetype to the hashtable.
763 */ 643 */
764 644void
765static void 645archetype::hash_add ()
766add_arch (archetype *at)
767{ 646{
768#if USE_UNORDERED_MAP 647 ht.insert (std::make_pair (name, this));
769 ht.insert (std::make_pair ((size_t) (const char *) at->name, at)); 648}
770#endif
771 649
772 int index = hasharch ((const char *) at->name, ARCHTABLE), org_index = index; 650void
773 651archetype::hash_del ()
774 for (;;) 652{
775 { 653 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} 654}
789 655
790/* 656/*
791 * Returns the first archetype using the given type. 657 * Returns the first archetype using the given type.
792 * Used in treasure-generation. 658 * Used in treasure-generation.
793 */ 659 */
794
795archetype * 660archetype *
796type_to_archetype (int type) 661type_to_archetype (int type)
797{ 662{
798 archetype *at; 663 archetype *at;
799 664
… …
812 677
813object * 678object *
814clone_arch (int type) 679clone_arch (int type)
815{ 680{
816 archetype *at; 681 archetype *at;
817 object *op = get_object ();
818 682
819 if ((at = type_to_archetype (type)) == NULL) 683 if ((at = type_to_archetype (type)) == NULL)
820 { 684 {
821 LOG (llevError, "Can't clone archetype %d\n", type); 685 LOG (llevError, "Can't clone archetype %d\n", type);
822 free_object (op);
823 return NULL; 686 return 0;
824 } 687 }
825 688
826 copy_object (&at->clone, op); 689 object *op = at->clone.clone ();
827 op->instantiate (); 690 op->instantiate ();
828 return op; 691 return op;
829} 692}
830 693
831/* 694/*

Diff Legend

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