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.34 by pippijn, Wed Jan 3 00:10:04 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 * 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)
308 for (archetype *bt = at; bt; bt = bt->more)
363 at->hash_add (); 309 bt->hash_add ();
364 310
365 LOG (llevDebug, "done\n"); 311 LOG (llevDebug, "done\n");
366} 312}
367 313
368void 314void
369free_all_archs (void) 315free_all_archs (void)
370{ 316{
371 archetype *at, *next; 317 archetype *at, *next;
372 int i = 0, f = 0; 318 int i = 0, f = 0;
373 319
374 for (at = first_archetype; at != NULL; at = next) 320 for (at = first_archetype; at; at = next)
375 { 321 {
376 if (at->more) 322 if (at->more)
377 next = at->more; 323 next = at->more;
378 else 324 else
379 next = at->next; 325 next = at->next;
… …
387 LOG (llevDebug, "Freed %d archetypes, %d faces\n", i, f); 333 LOG (llevDebug, "Freed %d archetypes, %d faces\n", i, f);
388} 334}
389 335
390archetype::archetype () 336archetype::archetype ()
391{ 337{
338 clone.arch = this;
339
392 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 */
393 SET_FLAG (&clone, FLAG_REMOVED); /* doesn't copy these flags... */ 341 SET_FLAG (&clone, FLAG_REMOVED); /* doesn't copy these flags... */
394} 342}
395 343
396archetype::~archetype () 344archetype::~archetype ()
397{ 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;
398} 393}
399 394
400/* 395/*
401 * Reads/parses the archetype-file, and copies into a linked list 396 * Reads/parses the archetype-file, and copies into a linked list
402 * of archetype-structures. 397 * of archetype-structures.
403 */ 398 */
404void 399static bool
405first_arch_pass (object_thawer & fp) 400first_arch_pass (object_thawer &f)
406{ 401{
407 archetype *head = 0, *last_more = 0; 402 for (;;)
408
409 archetype *at = new archetype;
410 at->clone.arch = first_archetype = at;
411
412 while (int i = load_object (fp, &at->clone, 0))
413 { 403 {
414 at->clone.speed_left = (float) (-0.1);
415 /* copy the body_info to the body_used - this is only really
416 * need for monsters, but doesn't hurt to do it for everything.
417 * by doing so, when a monster is created, it has good starting
418 * values for the body_used info, so when items are created
419 * for it, they can be properly equipped.
420 */
421 memcpy (&at->clone.body_used, &at->clone.body_info, sizeof (at->clone.body_info));
422
423 switch (i) 404 switch (f.kw)
424 {
425 case LL_NORMAL: /* A new archetype, just link it with the previous */
426 if (last_more != NULL)
427 last_more->next = at;
428 if (head != NULL)
429 head->next = at;
430 head = last_more = at;
431#if 0
432 if (!op->type)
433 LOG (llevDebug, " WARNING: Archetype %s has no type info!\n", op->arch->name);
434#endif
435 at->tail_x = 0;
436 at->tail_y = 0;
437 break;
438
439 case LL_MORE: /* Another part of the previous archetype, link it correctly */
440
441 at->head = head;
442 at->clone.head = &head->clone;
443 if (last_more != NULL)
444 {
445 last_more->more = at;
446 last_more->clone.more = &at->clone;
447 }
448 last_more = at;
449
450 /* If this multipart image is still composed of individual small
451 * images, don't set the tail_.. values. We can't use them anyways,
452 * and setting these to zero makes the map sending to the client much
453 * easier as just looking at the head, we know what to do.
454 */
455 if (at->clone.face != head->clone.face)
456 {
457 head->tail_x = 0;
458 head->tail_y = 0;
459 }
460 else
461 {
462 if (at->clone.x > head->tail_x)
463 head->tail_x = at->clone.x;
464 if (at->clone.y > head->tail_y)
465 head->tail_y = at->clone.y;
466 }
467 break;
468
469 } 405 {
406 case KW_object:
407 if (!archetype::read (f))
408 return false;
409 continue;
470 410
471 at = new archetype; 411 case KW_EOF:
412 return true;
472 413
473 at->clone.arch = at; 414 default:
474 } 415 if (!f.parse_error ("archetypes file"))
416 return false;
417 }
475 418
476 delete at; 419 f.next ();
420 }
477} 421}
478 422
479/* 423/*
480 * Reads the archetype file once more, and links all pointers between 424 * Reads the archetype file once more, and links all pointers between
481 * archetypes. 425 * archetypes.
482 */ 426 */
483
484void 427void
485second_arch_pass (object_thawer & thawer) 428second_arch_pass (object_thawer & thawer)
486{ 429{
487 char buf[MAX_BUF], *variable = buf, *argument, *cp; 430 char buf[MAX_BUF], *variable = buf, *argument, *cp;
488 archetype *at = NULL, *other; 431 archetype *at = NULL, *other;
489 432
490 while (fgets (buf, MAX_BUF, thawer) != NULL) 433 while (fgets (buf, MAX_BUF, thawer) != NULL)
491 { 434 {
492 if (*buf == '#') 435 if (*buf == '#')
493 continue; 436 continue;
437
494 if ((argument = strchr (buf, ' ')) != NULL) 438 if ((argument = strchr (buf, ' ')) != NULL)
495 { 439 {
496 *argument = '\0', argument++; 440 *argument = '\0', argument++;
497 cp = argument + strlen (argument) - 1; 441 cp = argument + strlen (argument) - 1;
498 while (isspace (*cp)) 442 while (isspace (*cp))
499 { 443 {
500 *cp = '\0'; 444 *cp = '\0';
501 cp--; 445 cp--;
502 } 446 }
503 } 447 }
448
504 if (!strcmp ("Object", variable)) 449 if (!strcmp ("object", variable))
505 { 450 {
506 if ((at = archetype::find (argument)) == NULL) 451 if ((at = archetype::find (argument)) == NULL)
507 LOG (llevError, "Warning: failed to find arch %s\n", argument); 452 LOG (llevError, "Warning: failed to find arch %s\n", argument);
508 } 453 }
509 else if (!strcmp ("other_arch", variable)) 454 else if (!strcmp ("other_arch", variable))
… …
516 at->clone.other_arch = other; 461 at->clone.other_arch = other;
517 } 462 }
518 } 463 }
519 else if (!strcmp ("randomitems", variable)) 464 else if (!strcmp ("randomitems", variable))
520 { 465 {
521 if (at != NULL) 466 if (at)
522 { 467 {
523 treasurelist *tl = find_treasurelist (argument); 468 treasurelist *tl = find_treasurelist (argument);
524 469
525 if (tl == NULL) 470 if (tl == NULL)
526 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);
… …
529 } 474 }
530 } 475 }
531 } 476 }
532} 477}
533 478
534#ifdef DEBUG
535void
536check_generators (void)
537{
538 archetype *at;
539
540 for (at = first_archetype; at != NULL; at = at->next)
541 if (QUERY_FLAG (&at->clone, FLAG_GENERATOR) && at->clone.other_arch == NULL)
542 LOG (llevError, "Warning: %s is generator but lacks other_arch.\n", &at->name);
543}
544#endif
545
546/* 479/*
547 * First initialises the archtype hash-table (init_archetable()). 480 * First initialises the archtype hash-table (init_archetable()).
548 * 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
549 * functions). 482 * functions).
550 * Then initialises treasures by calling load_treasures(). 483 * Then initialises treasures by calling load_treasures().
551 */ 484 */
552
553void 485void
554load_archetypes (void) 486load_archetypes (void)
555{ 487{
556 char filename[MAX_BUF]; 488 char filename[MAX_BUF];
557 489
558 sprintf (filename, "%s/%s", settings.datadir, settings.archetypes); 490 sprintf (filename, "%s/%s", settings.datadir, settings.archetypes);
559 LOG (llevDebug, "Reading archetypes from %s:\n", filename); 491 LOG (llevDebug, "Reading archetypes from %s:\n", filename);
560 492
561 { 493 {
562 object_thawer
563 thawer (filename); 494 object_thawer f (filename);
564 495
565 clear_archetable (); 496 f.next ();
497
566 LOG (llevDebug, " arch-pass 1...\n"); 498 LOG (llevDebug, " arch-pass 1...\n");
567 first_arch_pass (thawer); 499 if (!first_arch_pass (f))
500 cleanup ("errors during first arch pass are fatal");
568 LOG (llevDebug, " done\n"); 501 LOG (llevDebug, " done\n");
569 } 502 }
570 503
571 init_archetable (); 504 init_archetable ();
572 warn_archetypes = 1; 505 warn_archetypes = 1;
573 506
574 { 507 {
575 object_thawer
576 thawer (filename); 508 object_thawer f (filename);
577 509
578 LOG (llevDebug, " loading treasure...\n"); 510 LOG (llevDebug, " loading treasure...\n");
579 load_treasures (); 511 load_treasures ();
580 LOG (llevDebug, " done\n"); 512 LOG (llevDebug, " done\n");
581 LOG (llevDebug, " arch-pass 2...\n"); 513 LOG (llevDebug, " arch-pass 2...\n");
582 second_arch_pass (thawer); 514 second_arch_pass (f);
583 LOG (llevDebug, " done\n"); 515 LOG (llevDebug, " done\n");
584#ifdef DEBUG
585 check_generators ();
586#endif
587 } 516 }
588 LOG (llevDebug, " done\n"); 517 LOG (llevDebug, " done\n");
589} 518}
590 519
591/* 520/*
… …
593 * This function returns NULL on failure. 522 * This function returns NULL on failure.
594 */ 523 */
595object * 524object *
596arch_to_object (archetype *at) 525arch_to_object (archetype *at)
597{ 526{
598 object *op; 527 if (!at)
599
600 if (at == NULL)
601 { 528 {
602 if (warn_archetypes) 529 if (warn_archetypes)
603 LOG (llevError, "Couldn't find archetype.\n"); 530 LOG (llevError, "Couldn't find archetype.\n");
604 531
605 return NULL; 532 return NULL;
606 } 533 }
607 534
608 op = at->clone.clone (); 535 object *op = at->clone.clone ();
609 op->arch = at; 536 op->arch = at;
610 op->instantiate (); 537 op->instantiate ();
611 return op; 538 return op;
612} 539}
613 540
… …
677 604
678/* 605/*
679 * Finds, using the hashtable, which archetype matches the given name. 606 * Finds, using the hashtable, which archetype matches the given name.
680 * returns a pointer to the found archetype, otherwise NULL. 607 * returns a pointer to the found archetype, otherwise NULL.
681 */ 608 */
682
683archetype * 609archetype *
684archetype::find (const char *name) 610archetype::find (const char *name)
685{ 611{
686 if (!name) 612 if (!name)
687 return 0; 613 return 0;
688 614
689#if USE_UNORDERED_MAP
690 AUTODECL (i, ht.find ((size_t) name)); 615 AUTODECL (i, ht.find (name));
691 616
692 if (i == ht.end ()) 617 if (i == ht.end ())
693 return 0; 618 return 0;
694 else 619 else
695 return i->second; 620 return i->second;
696#endif
697
698 archetype *at;
699 unsigned long index;
700
701 index = hasharch (name, ARCHTABLE);
702 arch_search++;
703 for (;;)
704 {
705 at = arch_table[index];
706
707 if (at == NULL)
708 {
709 if (warn_archetypes)
710 LOG (llevError, "Couldn't find archetype %s\n", name);
711
712 return NULL;
713 }
714
715 arch_cmp++;
716
717 if (!strcmp ((const char *) at->name, name))
718 return at;
719
720 if (++index >= ARCHTABLE)
721 index = 0;
722 }
723} 621}
724 622
725/* 623/*
726 * Adds an archetype to the hashtable. 624 * Adds an archetype to the hashtable.
727 */ 625 */
728void 626void
729archetype::hash_add () 627archetype::hash_add ()
730{ 628{
731#if USE_UNORDERED_MAP
732 ht.insert (std::make_pair ((size_t) (const char *) name, this)); 629 ht.insert (std::make_pair (name, this));
733#else
734
735 int index = hasharch ((const char *) name, ARCHTABLE), org_index = index;
736
737 for (;;)
738 {
739 if (!arch_table[index])
740 {
741 arch_table[index] = this;
742 break;
743 }
744
745 if (++index == ARCHTABLE)
746 index = 0;
747
748 if (index == org_index)
749 fatal (ARCHTABLE_TOO_SMALL);
750 }
751#endif
752} 630}
753 631
754void 632void
755archetype::hash_del () 633archetype::hash_del ()
756{ 634{
757#if USE_UNORDERED_MAP 635 ht.erase (name);
758# error remove this from HT
759#else
760
761 int index = hasharch ((const char *) name, ARCHTABLE), org_index = index;
762
763 for (;;)
764 {
765 if (arch_table[index] == this)
766 {
767 arch_table[index] = 0;
768 break;
769 }
770
771 if (++index == ARCHTABLE)
772 index = 0;
773
774 if (index == org_index)
775 break;
776 }
777#endif
778} 636}
779 637
780/* 638/*
781 * Returns the first archetype using the given type. 639 * Returns the first archetype using the given type.
782 * Used in treasure-generation. 640 * Used in treasure-generation.
783 */ 641 */
784
785archetype * 642archetype *
786type_to_archetype (int type) 643type_to_archetype (int type)
787{ 644{
788 archetype *at; 645 archetype *at;
789 646

Diff Legend

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