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.36 by pippijn, Sat Jan 6 14:42:28 2007 UTC vs.
Revision 1.54 by root, Tue Apr 17 18:59:05 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) 2005, 2006, 2007 Marc Lehmann & Crossfire+ Development Team
5 Copyright (C) 2002 Mark Wedel & Crossfire Development Team 5 * Copyright (C) 2002 Mark Wedel & Crossfire Development Team
6 Copyright (C) 1992 Frank Tore Johansen 6 * Copyright (C) 1992 Frank Tore Johansen
7 7 *
8 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
9 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
10 the Free Software Foundation; either version 2 of the License, or 10 * the Free Software Foundation; either version 2 of the License, or
11 (at your option) any later version. 11 * (at your option) any later version.
12 12 *
13 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,
14 but WITHOUT ANY WARRANTY; without even the implied warranty of 14 * but WITHOUT ANY WARRANTY; without even the implied warranty of
15 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the 15 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
16 GNU General Public License for more details. 16 * GNU General Public License for more details.
17 17 *
18 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
19 along with this program; if not, write to the Free Software 19 * along with this program; if not, write to the Free Software
20 Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. 20 * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
21 21 *
22 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>
23*/ 23 */
24 24
25#include <cassert> 25#include <cassert>
26 26
27#include <global.h> 27#include <global.h>
28#include <funcpoint.h> 28#include <funcpoint.h>
29#include <loader.h> 29#include <loader.h>
30 30
31#define USE_UNORDERED_MAP 0
32
33#if USE_UNORDERED_MAP
34# include <tr1/functional> 31#include <tr1/functional>
35# include <tr1/unordered_map> 32#include <tr1/unordered_map>
36#endif
37
38int arch_cmp = 0; /* How many strcmp's */
39int arch_search = 0; /* How many searches */
40int arch_init; /* True if doing arch initialization */
41 33
42/* The naming of these functions is really poor - they are all 34/* The naming of these functions is really poor - they are all
43 * pretty much named '.._arch_...', but they may more may not 35 * pretty much named '.._arch_...', but they may more may not
44 * return archetypes. Some make the arch_to_object call, and thus 36 * return archetypes. Some make the arch_to_object call, and thus
45 * return an object. Perhaps those should be called 'archob' functions 37 * return an object. Perhaps those should be called 'archob' functions
46 * to denote they return an object derived from the archetype. 38 * to denote they return an object derived from the archetype.
47 * MSW 2003-04-29 39 * MSW 2003-04-29
48 */ 40 */
49 41
50#if USE_UNORDERED_MAP 42bool loading_arch; // ugly flag to object laoder etc. to suppress/request special processing
43
51// the hashtable 44// the hashtable
52typedef std::tr1::unordered_map 45typedef std::tr1::unordered_map
53 < 46 <
54 std::size_t, 47 const char *,
55 arch_ptr, 48 arch_ptr,
56 std::tr1::hash<size_t>, 49 str_hash,
57 std::equal_to<size_t>, 50 str_equal,
58 slice_allocator< std::pair<const std::size_t, archetype *> > 51 slice_allocator< std::pair<const char *const, arch_ptr> >
59 true,
60 > HT; 52 > HT;
61 53
62static HT ht; 54static HT ht (5000);
63#else 55static std::vector<archetype *> archetypes;
64static arch_ptr arch_table[ARCHTABLE];
65#endif
66 56
67/** 57/**
68 * GROS - This function retrieves an archetype given the name that appears 58 * GROS - This function retrieves an archetype given the name that appears
69 * during the game (for example, "writing pen" instead of "stylus"). 59 * during the game (for example, "writing pen" instead of "stylus").
70 * It does not use the hashtable system, but browse the whole archlist each time. 60 * It does not use the hashtable system, but browse the whole archlist each time.
… …
76 * - the archetype found or null if nothing was found. 66 * - the archetype found or null if nothing was found.
77 */ 67 */
78archetype * 68archetype *
79find_archetype_by_object_name (const char *name) 69find_archetype_by_object_name (const char *name)
80{ 70{
81 archetype *at; 71 shstr_cmp name_cmp (name);
82 72
83 if (name == NULL)
84 return (archetype *) NULL;
85
86 for (at = first_archetype; at != NULL; at = at->next) 73 for (archetype *at = first_archetype; at; at = at->next)
87 { 74 if (at->clone.name == name_cmp)
88 if (!strcmp (at->clone.name, name))
89 return at; 75 return at;
90 } 76
91 return NULL; 77 return 0;
92} 78}
93 79
94/** 80/**
95 * This function retrieves an archetype by type and name that appears during 81 * This function retrieves an archetype by type and name that appears during
96 * the game. It is basically the same as find_archetype_by_object_name() 82 * the game. It is basically the same as find_archetype_by_object_name()
97 * except that it considers only items of the given type. 83 * except that it considers only items of the given type.
98 */ 84 */
99archetype * 85archetype *
100find_archetype_by_object_type_name (int type, const char *name) 86find_archetype_by_object_type_name (int type, const char *name)
101{ 87{
102 archetype *at; 88 shstr_cmp name_cmp (name);
103 89
104 if (name == NULL)
105 return NULL;
106
107 for (at = first_archetype; at != NULL; at = at->next) 90 for (archetype *at = first_archetype; at; at = at->next)
108 { 91 if (at->clone.name == name_cmp && at->clone.type == type)
109 if (at->clone.type == type && strcmp (at->clone.name, name) == 0)
110 return at; 92 return at;
111 }
112 93
113 return NULL; 94 return 0;
114} 95}
115 96
116/* This is a lot like the above function. Instead, we are trying to match 97/* This is a lot like the above function. Instead, we are trying to match
117 * the arch->skill values. type is the type of object to match 98 * the arch->skill values. type is the type of object to match
118 * against (eg, to only match against skills or only skill objects for example). 99 * against (eg, to only match against skills or only skill objects for example).
119 * If type is -1, ew don't match on type. 100 * If type is -1, ew don't match on type.
120 */ 101 */
121object * 102object *
122get_archetype_by_skill_name (const char *skill, int type) 103get_archetype_by_skill_name (const char *skill, int type)
123{ 104{
124 archetype *at; 105 shstr_cmp skill_cmp (skill);
125 106
126 if (skill)
127 for (at = first_archetype; at; at = at->next) 107 for (archetype *at = first_archetype; at; at = at->next)
128 if (((type == -1) || (type == at->clone.type)) && (!strcmp (at->clone.skill, skill))) 108 if (at->clone.skill == skill_cmp && (type == -1 || type == at->clone.type))
129 return arch_to_object (at); 109 return arch_to_object (at);
130 110
131 return 0; 111 return 0;
132} 112}
133 113
134/* similiar to above - this returns the first archetype 114/* similiar to above - this returns the first archetype
… …
139 * (eg, skills) 119 * (eg, skills)
140 */ 120 */
141archetype * 121archetype *
142get_archetype_by_type_subtype (int type, int subtype) 122get_archetype_by_type_subtype (int type, int subtype)
143{ 123{
144 archetype *
145 at;
146
147 for (at = first_archetype; at != NULL; at = at->next) 124 for (archetype *at = first_archetype; at; at = at->next)
148 {
149 if (((type == -1) || (type == at->clone.type)) && (subtype == -1 || subtype == at->clone.subtype)) 125 if ((type == -1 || type == at->clone.type) && (subtype == -1 || subtype == at->clone.subtype))
150 return at; 126 return at;
151 } 127
152 return NULL; 128 return 0;
153} 129}
154 130
155/** 131/**
156 * GROS - this returns a new object given the name that appears during the game 132 * GROS - this returns a new object given the name that appears during the game
157 * (for example, "writing pen" instead of "stylus"). 133 * (for example, "writing pen" instead of "stylus").
… …
165 * but it otherwise had a big memory leak. 141 * but it otherwise had a big memory leak.
166 */ 142 */
167object * 143object *
168get_archetype_by_object_name (const char *name) 144get_archetype_by_object_name (const char *name)
169{ 145{
170 archetype *at;
171 char tmpname[MAX_BUF]; 146 char tmpname[MAX_BUF];
172 int i; 147 int i;
173 148
174 assign (tmpname, name); 149 assign (tmpname, name);
175 150
176 for (i = strlen (tmpname); i > 0; i--) 151 for (i = strlen (tmpname); i > 0; i--)
177 { 152 {
178 tmpname[i] = 0; 153 tmpname[i] = 0;
154
179 at = find_archetype_by_object_name (tmpname); 155 if (archetype *at = find_archetype_by_object_name (tmpname))
180
181 if (at)
182 return arch_to_object (at); 156 return arch_to_object (at);
183 } 157 }
184 158
185 return create_singularity (name); 159 return create_singularity (name);
186} 160}
… …
206item_matched_string (object *pl, object *op, const char *name) 180item_matched_string (object *pl, object *op, const char *name)
207{ 181{
208 char *cp, local_name[MAX_BUF]; 182 char *cp, local_name[MAX_BUF];
209 int count, retval = 0; 183 int count, retval = 0;
210 184
211 strcpy (local_name, name); /* strtok is destructive to name */ 185 assign (local_name, name); /* strtok is destructive to name */
212 186
213 for (cp = strtok (local_name, ","); cp; cp = strtok (NULL, ",")) 187 for (cp = strtok (local_name, ","); cp; cp = strtok (NULL, ","))
214 { 188 {
215 while (cp[0] == ' ') 189 while (cp[0] == ' ')
216 ++cp; /* get rid of spaces */ 190 ++cp; /* get rid of spaces */
… …
301 } 275 }
302 276
303 return 0; 277 return 0;
304} 278}
305 279
306/*
307 * Initialises the internal linked list of archetypes (read from file).
308 * Then the global "empty_archetype" pointer is initialised.
309 * Then the blocksview[] array is initialised.
310 */
311
312void
313init_archetypes (void)
314{ /* called from add_player() and edit() */
315 if (first_archetype != NULL) /* Only do this once */
316 return;
317
318 arch_init = 1;
319 load_archetypes ();
320 arch_init = 0;
321 empty_archetype = archetype::find ("empty_archetype");
322
323/* init_blocksview();*/
324}
325
326/*
327 * Stores debug-information about how efficient the hashtable
328 * used for archetypes has been in the static errmsg array.
329 */
330
331void
332arch_info (object *op)
333{
334 sprintf (errmsg, "%d searches and %d strcmp()'s", arch_search, arch_cmp);
335 new_draw_info (NDI_BLACK, 0, op, errmsg);
336}
337
338/*
339 * Initialise the hashtable used by the archetypes.
340 */
341
342void
343clear_archetable (void)
344{
345 memset ((void *) arch_table, 0, ARCHTABLE * sizeof (archetype *));
346}
347
348/*
349 * An alternative way to init the hashtable which is slower, but _works_...
350 */
351
352void
353init_archetable (void)
354{
355 archetype *at;
356
357 LOG (llevDebug, " Setting up archetable...\n");
358
359 for (at = first_archetype; at != NULL; at = (at->more == NULL) ? at->next : at->more)
360 at->hash_add ();
361
362 LOG (llevDebug, "done\n");
363}
364
365void
366free_all_archs (void)
367{
368 archetype *at, *next;
369 int i = 0, f = 0;
370
371 for (at = first_archetype; at != NULL; at = next)
372 {
373 if (at->more)
374 next = at->more;
375 else
376 next = at->next;
377
378 delete
379 at;
380
381 i++;
382 }
383
384 LOG (llevDebug, "Freed %d archetypes, %d faces\n", i, f);
385}
386
387archetype::archetype () 280archetype::archetype ()
388{ 281{
282 clone.arch = this;
283
389 CLEAR_FLAG (&clone, FLAG_FREED); /* This shouldn't matter, since copy_to */ 284 CLEAR_FLAG (&clone, FLAG_FREED); /* This shouldn't matter, since copy_to */
390 SET_FLAG (&clone, FLAG_REMOVED); /* doesn't copy these flags... */ 285 SET_FLAG (&clone, FLAG_REMOVED); /* doesn't copy these flags... */
391} 286}
392 287
393archetype::~archetype () 288archetype::~archetype ()
394{ 289{
290 //TODO: nuke ->more's
395} 291}
396 292
397/* 293static void
398 * Reads/parses the archetype-file, and copies into a linked list 294unlink (archetype *at)
399 * of archetype-structures. 295{
400 */ 296 if (at->head)
297 at = at->head;
298
299 // destroy this archetype's link, making singletons out of its parts
300 while (at)
301 {
302 archetype *more = at->more;
303 at->clone.destroy_inv ();
304 at->head = at->more = 0;
305 at = more;
306 }
307}
308
309// dire hack, need to rationalise
401void 310void
402first_arch_pass (object_thawer & fp) 311overwrite (archetype *at, object *op)
403{ 312{
404 archetype *head = 0, *last_more = 0; 313 at->clone = *op;
314
315 at->clone.arch = at;
316 at->clone.inv = op->inv; op->inv = 0;
405 317
406 archetype *at = new archetype; 318 op->destroy ();
407 at->clone.arch = first_archetype = at; 319}
408 320
409 while (int i = load_object (fp, &at->clone, 0)) 321archetype *
410 { 322archetype::read (object_thawer &f)
411 at->clone.speed_left = (float) (-0.1); 323{
412 /* copy the body_info to the body_used - this is only really 324 assert (f.kw == KW_object);
413 * need for monsters, but doesn't hurt to do it for everything.
414 * by doing so, when a monster is created, it has good starting
415 * values for the body_used info, so when items are created
416 * for it, they can be properly equipped.
417 */
418 memcpy (&at->clone.body_used, &at->clone.body_info, sizeof (at->clone.body_info));
419 325
420 switch (i) 326 loading_arch = true; // hack to tell parse_kv et al. to behave
327
328 typedef std::pair<archetype *, object *> part;
329 std::vector<part> parts;
330
331 coroapi::cede_to_tick_every (100);
332
333 for (;;)
334 {
335 object *op = object::create ();
336 archetype *at = get (f.get_str ());
337 f.get (op->name);
338 f.next ();
339
340 if (!op->parse_kv (f))
341 goto fail;
342
343 parts.push_back (std::make_pair (at, op));
344
345 if (f.kw != KW_more)
346 break;
347
348 f.next ();
349
350 if (f.kw != KW_object)
421 { 351 {
422 case LL_NORMAL: /* A new archetype, just link it with the previous */ 352 f.parse_error ("more object");
423 if (last_more != NULL) 353 goto fail;
424 last_more->next = at;
425 if (head != NULL)
426 head->next = at;
427 head = last_more = at;
428#if 0
429 if (!op->type)
430 LOG (llevDebug, " WARNING: Archetype %s has no type info!\n", op->arch->name);
431#endif
432 at->tail_x = 0;
433 at->tail_y = 0;
434 break;
435
436 case LL_MORE: /* Another part of the previous archetype, link it correctly */
437
438 at->head = head;
439 at->clone.head = &head->clone;
440 if (last_more != NULL)
441 {
442 last_more->more = at;
443 last_more->clone.more = &at->clone;
444 }
445 last_more = at;
446
447 /* If this multipart image is still composed of individual small
448 * images, don't set the tail_.. values. We can't use them anyways,
449 * and setting these to zero makes the map sending to the client much
450 * easier as just looking at the head, we know what to do.
451 */
452 if (at->clone.face != head->clone.face)
453 {
454 head->tail_x = 0;
455 head->tail_y = 0;
456 }
457 else
458 {
459 if (at->clone.x > head->tail_x)
460 head->tail_x = at->clone.x;
461 if (at->clone.y > head->tail_y)
462 head->tail_y = at->clone.y;
463 }
464 break;
465
466 } 354 }
355 }
467 356
468 at = new archetype; 357 {
358 archetype *head = parts.front ().first;
469 359
470 at->clone.arch = at; 360 // check that all archetypes belong to the same object or are heads
361 for (auto (p, parts.begin ()); p != parts.end (); ++p)
362 {
363 archetype *at = p->first;
364
365 if (at->head != head && at->head)
366 {
367 LOG (llevError, "%s: unable to overwrite foreign non-head archetype with non-head archetype\n", &at->name);
368 goto fail;
369 }
370
371 if (at->next && at != head)
372 {
373 LOG (llevError, "%s: unable to overwrite foreign head archetype with non-head archetype\n", &at->name);
374 goto fail;
375 }
471 } 376 }
472 377
473 delete at; 378 // sever chain of existing head object
474} 379 for (archetype *more, *at = head; at; at = more)
380 {
381 more = at->more;
475 382
476/* 383 at->head = 0;
477 * Reads the archetype file once more, and links all pointers between 384 at->more = 0;
478 * archetypes. 385 }
479 */
480 386
387 // replace/update head
388 overwrite (head, parts.front ().second);
389 head->tail_x = 0;
390 head->tail_y = 0;
391
392 // link into list of heads, if not already there
393 if (!head->linked)
394 {
395 head->linked = true;
396 head->next = first_archetype;
397 first_archetype = head;
398 }
399
400 // reassemble new chain
401 archetype *prev = head;
402 for (auto (p, parts.begin () + 1); p != parts.end (); ++p)
403 {
404 archetype *at = p->first;
405 overwrite (at, p->second);
406
407 if (at->clone.x > head->tail_x) head->tail_x = at->clone.x;
408 if (at->clone.y > head->tail_y) head->tail_y = at->clone.y;
409
410 at->head = head;
411 at->clone.head = &head->clone;
412 prev->more = at;
413 prev->clone.more = &at->clone;
414
415 prev = at;
416 }
417
418 loading_arch = false;
419 return head;
420 }
421
422fail:
423 for (auto (p, parts.begin ()); p != parts.end (); ++p)
424 p->second->destroy (true);
425
426 loading_arch = false;
427 return 0;
428}
429
430/*
431 * Initialize global archtype pointers:
432 */
481void 433void
482second_arch_pass (object_thawer & thawer) 434init_archetype_pointers ()
483{ 435{
484 char buf[MAX_BUF], *variable = buf, *argument, *cp; 436 ring_arch = archetype::find ("ring");
485 archetype *at = NULL, *other; 437 amulet_arch = archetype::find ("amulet");
486 438 staff_arch = archetype::find ("staff");
487 while (fgets (buf, MAX_BUF, thawer) != NULL) 439 crown_arch = archetype::find ("crown");
488 { 440 empty_archetype = archetype::find ("empty_archetype");
489 if (*buf == '#')
490 continue;
491 if ((argument = strchr (buf, ' ')) != NULL)
492 {
493 *argument = '\0', argument++;
494 cp = argument + strlen (argument) - 1;
495 while (isspace (*cp))
496 {
497 *cp = '\0';
498 cp--;
499 }
500 }
501 if (!strcmp ("Object", variable))
502 {
503 if ((at = archetype::find (argument)) == NULL)
504 LOG (llevError, "Warning: failed to find arch %s\n", argument);
505 }
506 else if (!strcmp ("other_arch", variable))
507 {
508 if (at != NULL && at->clone.other_arch == NULL)
509 {
510 if ((other = archetype::find (argument)) == NULL)
511 LOG (llevError, "Warning: failed to find other_arch %s\n", argument);
512 else if (at != NULL)
513 at->clone.other_arch = other;
514 }
515 }
516 else if (!strcmp ("randomitems", variable))
517 {
518 if (at != NULL)
519 {
520 treasurelist *tl = find_treasurelist (argument);
521
522 if (tl == NULL)
523 LOG (llevError, "Failed to link treasure to arch (%s): %s\n", &at->name, argument);
524 else
525 at->clone.randomitems = tl;
526 }
527 }
528 }
529}
530
531#ifdef DEBUG
532void
533check_generators (void)
534{
535 archetype *at;
536
537 for (at = first_archetype; at != NULL; at = at->next)
538 if (QUERY_FLAG (&at->clone, FLAG_GENERATOR) && at->clone.other_arch == NULL)
539 LOG (llevError, "Warning: %s is generator but lacks other_arch.\n", &at->name);
540}
541#endif
542
543/*
544 * First initialises the archtype hash-table (init_archetable()).
545 * Reads and parses the archetype file (with the first and second-pass
546 * functions).
547 * Then initialises treasures by calling load_treasures().
548 */
549
550void
551load_archetypes (void)
552{
553 char filename[MAX_BUF];
554
555 sprintf (filename, "%s/%s", settings.datadir, settings.archetypes);
556 LOG (llevDebug, "Reading archetypes from %s:\n", filename);
557
558 {
559 object_thawer
560 thawer (filename);
561
562 clear_archetable ();
563 LOG (llevDebug, " arch-pass 1...\n");
564 first_arch_pass (thawer);
565 LOG (llevDebug, " done\n");
566 }
567
568 init_archetable ();
569 warn_archetypes = 1;
570
571 {
572 object_thawer
573 thawer (filename);
574
575 LOG (llevDebug, " loading treasure...\n");
576 load_treasures ();
577 LOG (llevDebug, " done\n");
578 LOG (llevDebug, " arch-pass 2...\n");
579 second_arch_pass (thawer);
580 LOG (llevDebug, " done\n");
581#ifdef DEBUG
582 check_generators ();
583#endif
584 }
585 LOG (llevDebug, " done\n");
586} 441}
587 442
588/* 443/*
589 * Creates and returns a new object which is a copy of the given archetype. 444 * Creates and returns a new object which is a copy of the given archetype.
590 * This function returns NULL on failure. 445 * This function returns NULL on failure.
591 */ 446 */
592object * 447object *
593arch_to_object (archetype *at) 448arch_to_object (archetype *at)
594{ 449{
595 object *op; 450 if (!at)
596
597 if (at == NULL)
598 { 451 {
599 if (warn_archetypes)
600 LOG (llevError, "Couldn't find archetype.\n"); 452 LOG (llevError, "Couldn't find archetype.\n");
601
602 return NULL; 453 return 0;
603 } 454 }
604 455
605 op = at->clone.clone (); 456 object *op = at->clone.clone ();
606 op->arch = at; 457 op->arch = at;
607 op->instantiate (); 458 op->instantiate ();
459
608 return op; 460 return op;
609} 461}
610 462
611/* 463/*
612 * Creates an object. This function is called by get_archetype() 464 * Creates an object. This function is called by get_archetype()
… …
641 493
642 return arch_to_object (at); 494 return arch_to_object (at);
643} 495}
644 496
645/* 497/*
646 * Hash-function used by the arch-hashtable.
647 */
648
649unsigned long
650hasharch (const char *str, int tablesize)
651{
652 unsigned long hash = 0;
653 unsigned int i = 0;
654 const char *p;
655
656 /* use the one-at-a-time hash function, which supposedly is
657 * better than the djb2-like one used by perl5.005, but
658 * certainly is better then the bug used here before.
659 * see http://burtleburtle.net/bob/hash/doobs.html
660 */
661 for (p = str; i < MAXSTRING && *p; p++, i++)
662 {
663 hash += *p;
664 hash += hash << 10;
665 hash ^= hash >> 6;
666 }
667
668 hash += hash << 3;
669 hash ^= hash >> 11;
670 hash += hash << 15;
671
672 return hash % tablesize;
673}
674
675/*
676 * Finds, using the hashtable, which archetype matches the given name. 498 * Finds, using the hashtable, which archetype matches the given name.
677 * returns a pointer to the found archetype, otherwise NULL. 499 * returns a pointer to the found archetype, otherwise NULL.
678 */ 500 */
679
680archetype * 501archetype *
681archetype::find (const char *name) 502archetype::find (const char *name)
682{ 503{
683 if (!name) 504 if (!name)
684 return 0; 505 return 0;
685 506
686#if USE_UNORDERED_MAP 507 auto (i, ht.find (name));
687 AUTODECL (i, ht.find ((size_t) name));
688 508
689 if (i == ht.end ()) 509 if (i == ht.end ())
690 return 0; 510 return 0;
691 else 511 else
692 return i->second; 512 return i->second;
693#endif 513}
694 514
695 archetype *at; 515archetype *
696 unsigned long index; 516archetype::get (const char *name)
517{
518 archetype *at = find (name);
697 519
698 index = hasharch (name, ARCHTABLE); 520 if (!at)
699 arch_search++;
700 for (;;)
701 {
702 at = arch_table[index];
703
704 if (at == NULL)
705 {
706 if (warn_archetypes)
707 LOG (llevError, "Couldn't find archetype %s\n", name);
708
709 return NULL;
710 }
711
712 arch_cmp++;
713
714 if (!strcmp ((const char *) at->name, name))
715 return at;
716
717 if (++index >= ARCHTABLE)
718 index = 0;
719 } 521 {
522 archetypes.push_back (at = new archetype);
523 at->name = name;
524 at->hash_add ();
525 }
526
527 return at;
720} 528}
721 529
722/* 530/*
723 * Adds an archetype to the hashtable. 531 * Adds an archetype to the hashtable.
724 */ 532 */
725void 533void
726archetype::hash_add () 534archetype::hash_add ()
727{ 535{
728#if USE_UNORDERED_MAP
729 ht.insert (std::make_pair ((size_t) (const char *) name, this)); 536 ht.insert (std::make_pair (name, this));
730#else
731
732 int index = hasharch ((const char *) name, ARCHTABLE), org_index = index;
733
734 for (;;)
735 {
736 if (!arch_table[index])
737 {
738 arch_table[index] = this;
739 break;
740 }
741
742 if (++index == ARCHTABLE)
743 index = 0;
744
745 if (index == org_index)
746 fatal (ARCHTABLE_TOO_SMALL);
747 }
748#endif
749} 537}
750 538
751void 539void
752archetype::hash_del () 540archetype::hash_del ()
753{ 541{
754#if USE_UNORDERED_MAP 542 ht.erase (name);
755# error remove this from HT
756#else
757
758 int index = hasharch ((const char *) name, ARCHTABLE), org_index = index;
759
760 for (;;)
761 {
762 if (arch_table[index] == this)
763 {
764 arch_table[index] = 0;
765 break;
766 }
767
768 if (++index == ARCHTABLE)
769 index = 0;
770
771 if (index == org_index)
772 break;
773 }
774#endif
775} 543}
776 544
777/* 545/*
778 * Returns the first archetype using the given type. 546 * Returns the first archetype using the given type.
779 * Used in treasure-generation. 547 * Used in treasure-generation.
780 */ 548 */
781
782archetype * 549archetype *
783type_to_archetype (int type) 550type_to_archetype (int type)
784{ 551{
785 archetype *at;
786
787 for (at = first_archetype; at; at = at->more == 0 ? at->next : at->more) 552 for (archetype *at = first_archetype; at; at = at->more == 0 ? at->next : at->more)
788 if (at->clone.type == type) 553 if (at->clone.type == type)
789 return at; 554 return at;
790 555
791 return 0; 556 return 0;
792} 557}
… …
794/* 559/*
795 * Returns a new object copied from the first archetype matching 560 * Returns a new object copied from the first archetype matching
796 * the given type. 561 * the given type.
797 * Used in treasure-generation. 562 * Used in treasure-generation.
798 */ 563 */
799
800object * 564object *
801clone_arch (int type) 565clone_arch (int type)
802{ 566{
803 archetype *at; 567 archetype *at;
804 568

Diff Legend

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