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.35 by root, Wed Jan 3 20:32:13 2007 UTC vs.
Revision 1.45 by root, Fri Apr 13 07:26:29 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 <global.h> 27#include <global.h>
27#include <funcpoint.h> 28#include <funcpoint.h>
28#include <loader.h> 29#include <loader.h>
29 30
30#define USE_UNORDERED_MAP 0
31
32#if USE_UNORDERED_MAP
33# include <tr1/functional> 31#include <tr1/functional>
34# include <tr1/unordered_map> 32#include <tr1/unordered_map>
35#endif
36 33
37int arch_cmp = 0; /* How many strcmp's */
38int arch_search = 0; /* How many searches */
39int arch_init; /* True if doing arch initialization */ 34int arch_init; /* True if doing arch initialization */
40 35
41/* The naming of these functions is really poor - they are all 36/* The naming of these functions is really poor - they are all
42 * pretty much named '.._arch_...', but they may more may not 37 * pretty much named '.._arch_...', but they may more may not
43 * return archetypes. Some make the arch_to_object call, and thus 38 * return archetypes. Some make the arch_to_object call, and thus
44 * return an object. Perhaps those should be called 'archob' functions 39 * return an object. Perhaps those should be called 'archob' functions
45 * to denote they return an object derived from the archetype. 40 * to denote they return an object derived from the archetype.
46 * MSW 2003-04-29 41 * MSW 2003-04-29
47 */ 42 */
48 43
49#if USE_UNORDERED_MAP
50// the hashtable 44// the hashtable
51typedef std::tr1::unordered_map 45typedef std::tr1::unordered_map
52 < 46 <
53 std::size_t, 47 const char *,
54 arch_ptr, 48 arch_ptr,
55 std::tr1::hash<size_t>, 49 str_hash,
56 std::equal_to<size_t>, 50 str_equal,
57 slice_allocator< std::pair<const std::size_t, archetype *> > 51 slice_allocator< std::pair<const char *const, arch_ptr> >
58 true,
59 > HT; 52 > HT;
60 53
61static HT ht; 54static HT ht (5000);
62#else
63static arch_ptr arch_table[ARCHTABLE];
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 *at; 104 shstr_cmp skill_cmp (skill);
124 105
125 if (skill)
126 for (at = first_archetype; at; at = at->next) 106 for (archetype *at = first_archetype; at; at = at->next)
127 if (((type == -1) || (type == at->clone.type)) && (!strcmp (at->clone.skill, skill))) 107 if (at->clone.skill == skill_cmp && (type == -1 || type == at->clone.type))
128 return arch_to_object (at); 108 return arch_to_object (at);
129 109
130 return 0; 110 return 0;
131} 111}
132 112
133/* similiar to above - this returns the first archetype 113/* similiar to above - this returns the first archetype
… …
138 * (eg, skills) 118 * (eg, skills)
139 */ 119 */
140archetype * 120archetype *
141get_archetype_by_type_subtype (int type, int subtype) 121get_archetype_by_type_subtype (int type, int subtype)
142{ 122{
143 archetype *
144 at;
145
146 for (at = first_archetype; at != NULL; at = at->next) 123 for (archetype *at = first_archetype; at; at = at->next)
147 {
148 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))
149 return at; 125 return at;
150 } 126
151 return NULL; 127 return 0;
152} 128}
153 129
154/** 130/**
155 * 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
156 * (for example, "writing pen" instead of "stylus"). 132 * (for example, "writing pen" instead of "stylus").
… …
164 * but it otherwise had a big memory leak. 140 * but it otherwise had a big memory leak.
165 */ 141 */
166object * 142object *
167get_archetype_by_object_name (const char *name) 143get_archetype_by_object_name (const char *name)
168{ 144{
169 archetype *at;
170 char tmpname[MAX_BUF]; 145 char tmpname[MAX_BUF];
171 int i; 146 int i;
172 147
173 assign (tmpname, name); 148 assign (tmpname, name);
174 149
175 for (i = strlen (tmpname); i > 0; i--) 150 for (i = strlen (tmpname); i > 0; i--)
176 { 151 {
177 tmpname[i] = 0; 152 tmpname[i] = 0;
153
178 at = find_archetype_by_object_name (tmpname); 154 if (archetype *at = find_archetype_by_object_name (tmpname))
179
180 if (at)
181 return arch_to_object (at); 155 return arch_to_object (at);
182 } 156 }
183 157
184 return create_singularity (name); 158 return create_singularity (name);
185} 159}
… …
205item_matched_string (object *pl, object *op, const char *name) 179item_matched_string (object *pl, object *op, const char *name)
206{ 180{
207 char *cp, local_name[MAX_BUF]; 181 char *cp, local_name[MAX_BUF];
208 int count, retval = 0; 182 int count, retval = 0;
209 183
210 strcpy (local_name, name); /* strtok is destructive to name */ 184 assign (local_name, name); /* strtok is destructive to name */
211 185
212 for (cp = strtok (local_name, ","); cp; cp = strtok (NULL, ",")) 186 for (cp = strtok (local_name, ","); cp; cp = strtok (NULL, ","))
213 { 187 {
214 while (cp[0] == ' ') 188 while (cp[0] == ' ')
215 ++cp; /* get rid of spaces */ 189 ++cp; /* get rid of spaces */
… …
321 295
322/* init_blocksview();*/ 296/* init_blocksview();*/
323} 297}
324 298
325/* 299/*
326 * Stores debug-information about how efficient the hashtable
327 * used for archetypes has been in the static errmsg array.
328 */
329
330void
331arch_info (object *op)
332{
333 sprintf (errmsg, "%d searches and %d strcmp()'s", arch_search, arch_cmp);
334 new_draw_info (NDI_BLACK, 0, op, errmsg);
335}
336
337/*
338 * Initialise the hashtable used by the archetypes.
339 */
340
341void
342clear_archetable (void)
343{
344 memset ((void *) arch_table, 0, ARCHTABLE * sizeof (archetype *));
345}
346
347/*
348 * 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_...
349 */ 301 */
350
351void 302void
352init_archetable (void) 303init_archetable (void)
353{ 304{
354 archetype *at;
355
356 LOG (llevDebug, " Setting up archetable...\n"); 305 LOG (llevDebug, " Setting up archetable...\n");
357 306
358 for (at = first_archetype; at != NULL; at = (at->more == NULL) ? at->next : at->more) 307 for (archetype *at = first_archetype; at; at = at->next)
308 for (archetype *bt = at; bt; bt = bt->more)
359 at->hash_add (); 309 bt->hash_add ();
360 310
361 LOG (llevDebug, "done\n"); 311 LOG (llevDebug, "done\n");
362} 312}
363 313
364void 314void
365free_all_archs (void) 315free_all_archs (void)
366{ 316{
367 archetype *at, *next; 317 archetype *at, *next;
368 int i = 0, f = 0; 318 int i = 0, f = 0;
369 319
370 for (at = first_archetype; at != NULL; at = next) 320 for (at = first_archetype; at; at = next)
371 { 321 {
372 if (at->more) 322 if (at->more)
373 next = at->more; 323 next = at->more;
374 else 324 else
375 next = at->next; 325 next = at->next;
… …
383 LOG (llevDebug, "Freed %d archetypes, %d faces\n", i, f); 333 LOG (llevDebug, "Freed %d archetypes, %d faces\n", i, f);
384} 334}
385 335
386archetype::archetype () 336archetype::archetype ()
387{ 337{
338 clone.arch = this;
339
388 CLEAR_FLAG (&clone, FLAG_FREED); /* This shouldn't matter, since copy_to */ 340 CLEAR_FLAG (&clone, FLAG_FREED); /* This shouldn't matter, since copy_to */
389 SET_FLAG (&clone, FLAG_REMOVED); /* doesn't copy these flags... */ 341 SET_FLAG (&clone, FLAG_REMOVED); /* doesn't copy these flags... */
390} 342}
391 343
392archetype::~archetype () 344archetype::~archetype ()
393{ 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 if (more->clone.x > head->tail_x) head->tail_x = more->clone.x;
379 if (more->clone.y > head->tail_y) head->tail_y = more->clone.y;
380
381 more->head = head;
382 more->clone.head = &head->clone;
383 prev->more = more;
384 prev->clone.more = &more->clone;
385
386 prev = more;
387 }
388
389 head->next = first_archetype;
390 first_archetype = head;
391
392 return head;
394} 393}
395 394
396/* 395/*
397 * Reads/parses the archetype-file, and copies into a linked list 396 * Reads/parses the archetype-file, and copies into a linked list
398 * of archetype-structures. 397 * of archetype-structures.
399 */ 398 */
400void 399static bool
401first_arch_pass (object_thawer & fp) 400first_arch_pass (object_thawer &f)
402{ 401{
403 archetype *head = 0, *last_more = 0; 402 for (;;)
404
405 archetype *at = new archetype;
406 at->clone.arch = first_archetype = at;
407
408 while (int i = load_object (fp, &at->clone, 0))
409 { 403 {
410 at->clone.speed_left = (float) (-0.1);
411 /* copy the body_info to the body_used - this is only really
412 * need for monsters, but doesn't hurt to do it for everything.
413 * by doing so, when a monster is created, it has good starting
414 * values for the body_used info, so when items are created
415 * for it, they can be properly equipped.
416 */
417 memcpy (&at->clone.body_used, &at->clone.body_info, sizeof (at->clone.body_info));
418
419 switch (i) 404 switch (f.kw)
420 {
421 case LL_NORMAL: /* A new archetype, just link it with the previous */
422 if (last_more != NULL)
423 last_more->next = at;
424 if (head != NULL)
425 head->next = at;
426 head = last_more = at;
427#if 0
428 if (!op->type)
429 LOG (llevDebug, " WARNING: Archetype %s has no type info!\n", op->arch->name);
430#endif
431 at->tail_x = 0;
432 at->tail_y = 0;
433 break;
434
435 case LL_MORE: /* Another part of the previous archetype, link it correctly */
436
437 at->head = head;
438 at->clone.head = &head->clone;
439 if (last_more != NULL)
440 {
441 last_more->more = at;
442 last_more->clone.more = &at->clone;
443 }
444 last_more = at;
445
446 /* If this multipart image is still composed of individual small
447 * images, don't set the tail_.. values. We can't use them anyways,
448 * and setting these to zero makes the map sending to the client much
449 * easier as just looking at the head, we know what to do.
450 */
451 if (at->clone.face != head->clone.face)
452 {
453 head->tail_x = 0;
454 head->tail_y = 0;
455 }
456 else
457 {
458 if (at->clone.x > head->tail_x)
459 head->tail_x = at->clone.x;
460 if (at->clone.y > head->tail_y)
461 head->tail_y = at->clone.y;
462 }
463 break;
464
465 } 405 {
406 case KW_object:
407 if (!archetype::read (f))
408 return false;
409 continue;
466 410
467 at = new archetype; 411 case KW_EOF:
412 return true;
468 413
469 at->clone.arch = at; 414 default:
470 } 415 if (!f.parse_error ("archetypes file"))
416 return false;
417 }
471 418
472 delete at; 419 f.next ();
420 }
473} 421}
474 422
475/* 423/*
476 * Reads the archetype file once more, and links all pointers between 424 * Reads the archetype file once more, and links all pointers between
477 * archetypes. 425 * archetypes.
478 */ 426 */
479
480void 427void
481second_arch_pass (object_thawer & thawer) 428second_arch_pass (object_thawer & thawer)
482{ 429{
483 char buf[MAX_BUF], *variable = buf, *argument, *cp; 430 char buf[MAX_BUF], *variable = buf, *argument, *cp;
484 archetype *at = NULL, *other; 431 archetype *at = NULL, *other;
485 432
486 while (fgets (buf, MAX_BUF, thawer) != NULL) 433 while (fgets (buf, MAX_BUF, thawer) != NULL)
487 { 434 {
488 if (*buf == '#') 435 if (*buf == '#')
489 continue; 436 continue;
437
490 if ((argument = strchr (buf, ' ')) != NULL) 438 if ((argument = strchr (buf, ' ')) != NULL)
491 { 439 {
492 *argument = '\0', argument++; 440 *argument = '\0', argument++;
493 cp = argument + strlen (argument) - 1; 441 cp = argument + strlen (argument) - 1;
494 while (isspace (*cp)) 442 while (isspace (*cp))
495 { 443 {
496 *cp = '\0'; 444 *cp = '\0';
497 cp--; 445 cp--;
498 } 446 }
499 } 447 }
448
500 if (!strcmp ("Object", variable)) 449 if (!strcmp ("object", variable))
501 { 450 {
502 if ((at = archetype::find (argument)) == NULL) 451 if ((at = archetype::find (argument)) == NULL)
503 LOG (llevError, "Warning: failed to find arch %s\n", argument); 452 LOG (llevError, "Warning: failed to find arch %s\n", argument);
504 } 453 }
505 else if (!strcmp ("other_arch", variable)) 454 else if (!strcmp ("other_arch", variable))
… …
512 at->clone.other_arch = other; 461 at->clone.other_arch = other;
513 } 462 }
514 } 463 }
515 else if (!strcmp ("randomitems", variable)) 464 else if (!strcmp ("randomitems", variable))
516 { 465 {
517 if (at != NULL) 466 if (at)
518 { 467 {
519 treasurelist *tl = find_treasurelist (argument); 468 treasurelist *tl = find_treasurelist (argument);
520 469
521 if (tl == NULL) 470 if (tl == NULL)
522 LOG (llevError, "Failed to link treasure to arch (%s): %s\n", &at->name, argument); 471 LOG (llevError, "Failed to link treasure to arch (%s): %s\n", &at->name, argument);
… …
525 } 474 }
526 } 475 }
527 } 476 }
528} 477}
529 478
530#ifdef DEBUG
531void
532check_generators (void)
533{
534 archetype *at;
535
536 for (at = first_archetype; at != NULL; at = at->next)
537 if (QUERY_FLAG (&at->clone, FLAG_GENERATOR) && at->clone.other_arch == NULL)
538 LOG (llevError, "Warning: %s is generator but lacks other_arch.\n", &at->name);
539}
540#endif
541
542/* 479/*
543 * First initialises the archtype hash-table (init_archetable()). 480 * First initialises the archtype hash-table (init_archetable()).
544 * Reads and parses the archetype file (with the first and second-pass 481 * Reads and parses the archetype file (with the first and second-pass
545 * functions). 482 * functions).
546 * Then initialises treasures by calling load_treasures(). 483 * Then initialises treasures by calling load_treasures().
547 */ 484 */
548
549void 485void
550load_archetypes (void) 486load_archetypes (void)
551{ 487{
552 char filename[MAX_BUF]; 488 char filename[MAX_BUF];
553 489
554 sprintf (filename, "%s/%s", settings.datadir, settings.archetypes); 490 sprintf (filename, "%s/%s", settings.datadir, settings.archetypes);
555 LOG (llevDebug, "Reading archetypes from %s:\n", filename); 491 LOG (llevDebug, "Reading archetypes from %s:\n", filename);
556 492
557 { 493 {
558 object_thawer
559 thawer (filename); 494 object_thawer f (filename);
560 495
561 clear_archetable (); 496 f.next ();
497
562 LOG (llevDebug, " arch-pass 1...\n"); 498 LOG (llevDebug, " arch-pass 1...\n");
563 first_arch_pass (thawer); 499 if (!first_arch_pass (f))
500 cleanup ("errors during first arch pass are fatal");
564 LOG (llevDebug, " done\n"); 501 LOG (llevDebug, " done\n");
565 } 502 }
566 503
567 init_archetable (); 504 init_archetable ();
568 warn_archetypes = 1; 505 warn_archetypes = 1;
569 506
570 { 507 {
571 object_thawer
572 thawer (filename); 508 object_thawer f (filename);
573 509
574 LOG (llevDebug, " loading treasure...\n"); 510 LOG (llevDebug, " loading treasure...\n");
575 load_treasures (); 511 load_treasures ();
576 LOG (llevDebug, " done\n"); 512 LOG (llevDebug, " done\n");
577 LOG (llevDebug, " arch-pass 2...\n"); 513 LOG (llevDebug, " arch-pass 2...\n");
578 second_arch_pass (thawer); 514 second_arch_pass (f);
579 LOG (llevDebug, " done\n"); 515 LOG (llevDebug, " done\n");
580#ifdef DEBUG
581 check_generators ();
582#endif
583 } 516 }
584 LOG (llevDebug, " done\n"); 517 LOG (llevDebug, " done\n");
585} 518}
586 519
587/* 520/*
… …
589 * This function returns NULL on failure. 522 * This function returns NULL on failure.
590 */ 523 */
591object * 524object *
592arch_to_object (archetype *at) 525arch_to_object (archetype *at)
593{ 526{
594 object *op; 527 if (!at)
595
596 if (at == NULL)
597 { 528 {
598 if (warn_archetypes) 529 if (warn_archetypes)
599 LOG (llevError, "Couldn't find archetype.\n"); 530 LOG (llevError, "Couldn't find archetype.\n");
600 531
601 return NULL; 532 return NULL;
602 } 533 }
603 534
604 op = at->clone.clone (); 535 object *op = at->clone.clone ();
605 op->arch = at; 536 op->arch = at;
606 op->instantiate (); 537 op->instantiate ();
607 return op; 538 return op;
608} 539}
609 540
… …
673 604
674/* 605/*
675 * Finds, using the hashtable, which archetype matches the given name. 606 * Finds, using the hashtable, which archetype matches the given name.
676 * returns a pointer to the found archetype, otherwise NULL. 607 * returns a pointer to the found archetype, otherwise NULL.
677 */ 608 */
678
679archetype * 609archetype *
680archetype::find (const char *name) 610archetype::find (const char *name)
681{ 611{
682 if (!name) 612 if (!name)
683 return 0; 613 return 0;
684 614
685#if USE_UNORDERED_MAP
686 AUTODECL (i, ht.find ((size_t) name)); 615 AUTODECL (i, ht.find (name));
687 616
688 if (i == ht.end ()) 617 if (i == ht.end ())
689 return 0; 618 return 0;
690 else 619 else
691 return i->second; 620 return i->second;
692#endif
693
694 archetype *at;
695 unsigned long index;
696
697 index = hasharch (name, ARCHTABLE);
698 arch_search++;
699 for (;;)
700 {
701 at = arch_table[index];
702
703 if (at == NULL)
704 {
705 if (warn_archetypes)
706 LOG (llevError, "Couldn't find archetype %s\n", name);
707
708 return NULL;
709 }
710
711 arch_cmp++;
712
713 if (!strcmp ((const char *) at->name, name))
714 return at;
715
716 if (++index >= ARCHTABLE)
717 index = 0;
718 }
719} 621}
720 622
721/* 623/*
722 * Adds an archetype to the hashtable. 624 * Adds an archetype to the hashtable.
723 */ 625 */
724void 626void
725archetype::hash_add () 627archetype::hash_add ()
726{ 628{
727#if USE_UNORDERED_MAP
728 ht.insert (std::make_pair ((size_t) (const char *) name, this)); 629 ht.insert (std::make_pair (name, this));
729#else
730
731 int index = hasharch ((const char *) name, ARCHTABLE), org_index = index;
732
733 for (;;)
734 {
735 if (!arch_table[index])
736 {
737 arch_table[index] = this;
738 break;
739 }
740
741 if (++index == ARCHTABLE)
742 index = 0;
743
744 if (index == org_index)
745 fatal (ARCHTABLE_TOO_SMALL);
746 }
747#endif
748} 630}
749 631
750void 632void
751archetype::hash_del () 633archetype::hash_del ()
752{ 634{
753#if USE_UNORDERED_MAP 635 ht.erase (name);
754# error remove this from HT
755#else
756
757 int index = hasharch ((const char *) name, ARCHTABLE), org_index = index;
758
759 for (;;)
760 {
761 if (arch_table[index] == this)
762 {
763 arch_table[index] = 0;
764 break;
765 }
766
767 if (++index == ARCHTABLE)
768 index = 0;
769
770 if (index == org_index)
771 break;
772 }
773#endif
774} 636}
775 637
776/* 638/*
777 * Returns the first archetype using the given type. 639 * Returns the first archetype using the given type.
778 * Used in treasure-generation. 640 * Used in treasure-generation.
779 */ 641 */
780
781archetype * 642archetype *
782type_to_archetype (int type) 643type_to_archetype (int type)
783{ 644{
784 archetype *at; 645 archetype *at;
785 646

Diff Legend

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