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.32 by root, Mon Dec 25 11:25:49 2006 UTC vs.
Revision 1.58 by root, Sat Apr 21 11:55:36 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
37int arch_cmp = 0; /* How many strcmp's */
38int arch_search = 0; /* How many searches */
39int arch_init; /* True if doing arch initialization */
40 33
41/* The naming of these functions is really poor - they are all 34/* The naming of these functions is really poor - they are all
42 * pretty much named '.._arch_...', but they may more may not 35 * pretty much named '.._arch_...', but they may more may not
43 * return archetypes. Some make the arch_to_object call, and thus 36 * return archetypes. Some make the arch_to_object call, and thus
44 * return an object. Perhaps those should be called 'archob' functions 37 * return an object. Perhaps those should be called 'archob' functions
45 * to denote they return an object derived from the archetype. 38 * to denote they return an object derived from the archetype.
46 * MSW 2003-04-29 39 * MSW 2003-04-29
47 */ 40 */
48 41
49#if USE_UNORDERED_MAP 42bool loading_arch; // ugly flag to object laoder etc. to suppress/request special processing
43
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 55static std::vector<archetype *> archetypes;
63static arch_ptr arch_table[ARCHTABLE];
64#endif
65 56
66/** 57/**
67 * GROS - This function retrieves an archetype given the name that appears 58 * GROS - This function retrieves an archetype given the name that appears
68 * during the game (for example, "writing pen" instead of "stylus"). 59 * 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. 60 * It does not use the hashtable system, but browse the whole archlist each time.
… …
75 * - the archetype found or null if nothing was found. 66 * - the archetype found or null if nothing was found.
76 */ 67 */
77archetype * 68archetype *
78find_archetype_by_object_name (const char *name) 69find_archetype_by_object_name (const char *name)
79{ 70{
80 archetype *at; 71 shstr_cmp name_cmp (name);
81 72
82 if (name == NULL)
83 return (archetype *) NULL;
84
85 for (at = first_archetype; at != NULL; at = at->next) 73 for (archetype *at = first_archetype; at; at = at->next)
86 { 74 if (at->clone.name == name_cmp)
87 if (!strcmp (at->clone.name, name))
88 return at; 75 return at;
89 } 76
90 return NULL; 77 return 0;
91} 78}
92 79
93/** 80/**
94 * 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
95 * 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()
96 * except that it considers only items of the given type. 83 * except that it considers only items of the given type.
97 */ 84 */
98archetype * 85archetype *
99find_archetype_by_object_type_name (int type, const char *name) 86find_archetype_by_object_type_name (int type, const char *name)
100{ 87{
101 archetype *at; 88 shstr_cmp name_cmp (name);
102 89
103 if (name == NULL)
104 return NULL;
105
106 for (at = first_archetype; at != NULL; at = at->next) 90 for (archetype *at = first_archetype; at; at = at->next)
107 { 91 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; 92 return at;
110 }
111 93
112 return NULL; 94 return 0;
113} 95}
114 96
115/* 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
116 * 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
117 * 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).
118 * If type is -1, ew don't match on type. 100 * If type is -1, ew don't match on type.
119 */ 101 */
120object * 102object *
121get_archetype_by_skill_name (const char *skill, int type) 103get_archetype_by_skill_name (const char *skill, int type)
122{ 104{
123 archetype * 105 shstr_cmp skill_cmp (skill);
124 at;
125 106
126 if (skill == NULL)
127 return NULL;
128
129 for (at = first_archetype; at != NULL; at = at->next) 107 for (archetype *at = first_archetype; at; at = at->next)
130 { 108 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); 109 return arch_to_object (at);
133 } 110
134 return NULL; 111 return 0;
135} 112}
136 113
137/* similiar to above - this returns the first archetype 114/* similiar to above - this returns the first archetype
138 * that matches both the type and subtype. type and subtype 115 * 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 116 * can be -1 to say ignore, but in this case, the match it does
… …
142 * (eg, skills) 119 * (eg, skills)
143 */ 120 */
144archetype * 121archetype *
145get_archetype_by_type_subtype (int type, int subtype) 122get_archetype_by_type_subtype (int type, int subtype)
146{ 123{
147 archetype *
148 at;
149
150 for (at = first_archetype; at != NULL; at = at->next) 124 for (archetype *at = first_archetype; at; at = at->next)
151 {
152 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))
153 return at; 126 return at;
154 } 127
155 return NULL; 128 return 0;
156} 129}
157 130
158/** 131/**
159 * 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
160 * (for example, "writing pen" instead of "stylus"). 133 * (for example, "writing pen" instead of "stylus").
… …
168 * but it otherwise had a big memory leak. 141 * but it otherwise had a big memory leak.
169 */ 142 */
170object * 143object *
171get_archetype_by_object_name (const char *name) 144get_archetype_by_object_name (const char *name)
172{ 145{
173 archetype *at;
174 char tmpname[MAX_BUF]; 146 char tmpname[MAX_BUF];
175 int i; 147 int i;
176 148
177 assign (tmpname, name); 149 assign (tmpname, name);
178 150
179 for (i = strlen (tmpname); i > 0; i--) 151 for (i = strlen (tmpname); i > 0; i--)
180 { 152 {
181 tmpname[i] = 0; 153 tmpname[i] = 0;
154
182 at = find_archetype_by_object_name (tmpname); 155 if (archetype *at = find_archetype_by_object_name (tmpname))
183
184 if (at != NULL)
185 return arch_to_object (at); 156 return arch_to_object (at);
186 } 157 }
187 158
188 return create_singularity (name); 159 return create_singularity (name);
189} 160}
… …
209item_matched_string (object *pl, object *op, const char *name) 180item_matched_string (object *pl, object *op, const char *name)
210{ 181{
211 char *cp, local_name[MAX_BUF]; 182 char *cp, local_name[MAX_BUF];
212 int count, retval = 0; 183 int count, retval = 0;
213 184
214 strcpy (local_name, name); /* strtok is destructive to name */ 185 assign (local_name, name); /* strtok is destructive to name */
215 186
216 for (cp = strtok (local_name, ","); cp; cp = strtok (NULL, ",")) 187 for (cp = strtok (local_name, ","); cp; cp = strtok (NULL, ","))
217 { 188 {
218 while (cp[0] == ' ') 189 while (cp[0] == ' ')
219 ++cp; /* get rid of spaces */ 190 ++cp; /* get rid of spaces */
… …
304 } 275 }
305 276
306 return 0; 277 return 0;
307} 278}
308 279
309/*
310 * Initialises the internal linked list of archetypes (read from file).
311 * Then the global "empty_archetype" pointer is initialised.
312 * Then the blocksview[] array is initialised.
313 */
314
315void
316init_archetypes (void)
317{ /* called from add_player() and edit() */
318 if (first_archetype != NULL) /* Only do this once */
319 return;
320
321 arch_init = 1;
322 load_archetypes ();
323 arch_init = 0;
324 empty_archetype = archetype::find ("empty_archetype");
325
326/* init_blocksview();*/
327}
328
329/*
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_...
353 */
354
355void
356init_archetable (void)
357{
358 archetype *at;
359
360 LOG (llevDebug, " Setting up archetable...\n");
361
362 for (at = first_archetype; at != NULL; at = (at->more == NULL) ? at->next : at->more)
363 at->hash_add ();
364
365 LOG (llevDebug, "done\n");
366}
367
368void
369free_all_archs (void)
370{
371 archetype *at, *next;
372 int i = 0, f = 0;
373
374 for (at = first_archetype; at != NULL; at = next)
375 {
376 if (at->more)
377 next = at->more;
378 else
379 next = at->next;
380
381 delete
382 at;
383
384 i++;
385 }
386
387 LOG (llevDebug, "Freed %d archetypes, %d faces\n", i, f);
388}
389
390archetype::archetype () 280archetype::archetype ()
391{ 281{
282 clone.arch = this;
283
392 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 */
393 SET_FLAG (&clone, FLAG_REMOVED); /* doesn't copy these flags... */ 285 SET_FLAG (&clone, FLAG_REMOVED); /* doesn't copy these flags... */
394} 286}
395 287
396archetype::~archetype () 288archetype::~archetype ()
397{ 289{
290 //TODO: nuke ->more's
398} 291}
399 292
400/* 293static void
401 * Reads/parses the archetype-file, and copies into a linked list 294unlink (archetype *at)
402 * of archetype-structures. 295{
403 */ 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
404void 310void
405first_arch_pass (object_thawer & fp) 311overwrite (archetype *at, object *op)
406{ 312{
407 archetype *head = 0, *last_more = 0; 313 at->clone = *op;
314 at->clone.arch = at;
408 315
409 archetype *at = new archetype; 316 at->clone.inv = op->inv; op->inv = 0;
410 at->clone.arch = first_archetype = at;
411 317
412 while (int i = load_object (fp, &at->clone, 0)) 318 op->destroy ();
413 { 319}
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 320
423 switch (i) 321archetype *
322archetype::read (object_thawer &f)
323{
324 assert (f.kw == KW_object);
325
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 0
341 if (f.kw == KW_inherit)
424 { 342 {
425 case LL_NORMAL: /* A new archetype, just link it with the previous */ 343 if (archetype *at = find (f.get_str ()))
426 if (last_more != NULL) 344 *op = at->clone;
427 last_more->next = at; 345 else
428 if (head != NULL) 346 LOG (llevError, "archetype '%s' tries to inherit from non-existent archetype '%s'.\n",
429 head->next = at; 347 &at->name, f.get_str ());
430 head = last_more = at; 348
431#if 0 349 f.next ();
432 if (!op->type) 350 }
433 LOG (llevDebug, " WARNING: Archetype %s has no type info!\n", op->arch->name);
434#endif 351#endif
435 at->tail_x = 0; 352
436 at->tail_y = 0; 353 if (!op->parse_kv (f))
354 goto fail;
355
356 parts.push_back (std::make_pair (at, op));
357
358 if (f.kw != KW_more)
437 break; 359 break;
438 360
439 case LL_MORE: /* Another part of the previous archetype, link it correctly */ 361 f.next ();
440 362
441 at->head = head; 363 if (f.kw != KW_object)
442 at->clone.head = &head->clone; 364 {
443 if (last_more != NULL) 365 f.parse_error ("more object");
444 { 366 goto fail;
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 } 367 }
368 }
470 369
471 at = new archetype; 370 {
371 archetype *head = parts.front ().first;
472 372
473 at->clone.arch = at; 373 // check that all archetypes belong to the same object or are heads
374 for (auto (p, parts.begin ()); p != parts.end (); ++p)
375 {
376 archetype *at = p->first;
377
378 if (at->head != head && at->head)
379 {
380 LOG (llevError, "%s: unable to overwrite foreign non-head archetype with non-head archetype\n", &at->name);
381 goto fail;
382 }
383
384 if (at->next && at != head)
385 {
386 LOG (llevError, "%s: unable to overwrite foreign head archetype with non-head archetype\n", &at->name);
387 goto fail;
388 }
474 } 389 }
475 390
476 delete at; 391 // sever chain of existing head object
477} 392 for (archetype *more, *at = head; at; at = more)
393 {
394 more = at->more;
478 395
479/* 396 at->head = 0;
480 * Reads the archetype file once more, and links all pointers between 397 at->more = 0;
481 * archetypes. 398 }
482 */
483 399
400 // replace/update head
401 overwrite (head, parts.front ().second);
402 head->tail_x = 0;
403 head->tail_y = 0;
404
405 // link into list of heads, if not already there
406 if (!head->linked)
407 {
408 head->linked = true;
409 head->next = first_archetype;
410 first_archetype = head;
411 }
412
413 // reassemble new chain
414 archetype *prev = head;
415 for (auto (p, parts.begin () + 1); p != parts.end (); ++p)
416 {
417 archetype *at = p->first;
418 overwrite (at, p->second);
419
420 if (at->clone.x > head->tail_x) head->tail_x = at->clone.x;
421 if (at->clone.y > head->tail_y) head->tail_y = at->clone.y;
422
423 at->head = head;
424 at->clone.head = &head->clone;
425 prev->more = at;
426 prev->clone.more = &at->clone;
427
428 prev = at;
429 }
430
431 loading_arch = false;
432 return head;
433 }
434
435fail:
436 for (auto (p, parts.begin ()); p != parts.end (); ++p)
437 p->second->destroy (true);
438
439 loading_arch = false;
440 return 0;
441}
442
443/*
444 * Initialize global archtype pointers:
445 */
484void 446void
485second_arch_pass (object_thawer & thawer) 447init_archetype_pointers ()
486{ 448{
487 char buf[MAX_BUF], *variable = buf, *argument, *cp; 449 ring_arch = archetype::find ("ring");
488 archetype *at = NULL, *other; 450 amulet_arch = archetype::find ("amulet");
489 451 staff_arch = archetype::find ("staff");
490 while (fgets (buf, MAX_BUF, thawer) != NULL) 452 crown_arch = archetype::find ("crown");
491 { 453 empty_archetype = archetype::find ("empty_archetype");
492 if (*buf == '#')
493 continue;
494 if ((argument = strchr (buf, ' ')) != NULL)
495 {
496 *argument = '\0', argument++;
497 cp = argument + strlen (argument) - 1;
498 while (isspace (*cp))
499 {
500 *cp = '\0';
501 cp--;
502 }
503 }
504 if (!strcmp ("Object", variable))
505 {
506 if ((at = archetype::find (argument)) == NULL)
507 LOG (llevError, "Warning: failed to find arch %s\n", argument);
508 }
509 else if (!strcmp ("other_arch", variable))
510 {
511 if (at != NULL && at->clone.other_arch == NULL)
512 {
513 if ((other = archetype::find (argument)) == NULL)
514 LOG (llevError, "Warning: failed to find other_arch %s\n", argument);
515 else if (at != NULL)
516 at->clone.other_arch = other;
517 }
518 }
519 else if (!strcmp ("randomitems", variable))
520 {
521 if (at != NULL)
522 {
523 treasurelist *tl = find_treasurelist (argument);
524
525 if (tl == NULL)
526 LOG (llevError, "Failed to link treasure to arch (%s): %s\n", &at->name, argument);
527 else
528 at->clone.randomitems = tl;
529 }
530 }
531 }
532}
533
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/*
547 * First initialises the archtype hash-table (init_archetable()).
548 * Reads and parses the archetype file (with the first and second-pass
549 * functions).
550 * Then initialises treasures by calling load_treasures().
551 */
552
553void
554load_archetypes (void)
555{
556 char filename[MAX_BUF];
557
558 sprintf (filename, "%s/%s", settings.datadir, settings.archetypes);
559 LOG (llevDebug, "Reading archetypes from %s:\n", filename);
560
561 {
562 object_thawer
563 thawer (filename);
564
565 clear_archetable ();
566 LOG (llevDebug, " arch-pass 1...\n");
567 first_arch_pass (thawer);
568 LOG (llevDebug, " done\n");
569 }
570
571 init_archetable ();
572 warn_archetypes = 1;
573
574 {
575 object_thawer
576 thawer (filename);
577
578 LOG (llevDebug, " loading treasure...\n");
579 load_treasures ();
580 LOG (llevDebug, " done\n arch-pass 2...\n");
581 second_arch_pass (thawer);
582 LOG (llevDebug, " done\n");
583#ifdef DEBUG
584 check_generators ();
585#endif
586 }
587 LOG (llevDebug, " done\n");
588} 454}
589 455
590/* 456/*
591 * Creates and returns a new object which is a copy of the given archetype. 457 * Creates and returns a new object which is a copy of the given archetype.
592 * This function returns NULL on failure. 458 * This function returns NULL on failure.
593 */ 459 */
594object * 460object *
595arch_to_object (archetype *at) 461arch_to_object (archetype *at)
596{ 462{
597 object *op; 463 if (!at)
598
599 if (at == NULL)
600 { 464 {
601 if (warn_archetypes)
602 LOG (llevError, "Couldn't find archetype.\n"); 465 LOG (llevError, "Couldn't find archetype.\n");
603
604 return NULL; 466 return 0;
605 } 467 }
606 468
607 op = at->clone.clone (); 469 object *op = at->clone.clone ();
608 op->arch = at; 470 op->arch = at;
609 op->instantiate (); 471 op->instantiate ();
472
610 return op; 473 return op;
611} 474}
612 475
613/* 476/*
614 * Creates an object. This function is called by get_archetype() 477 * Creates an object. This function is called by get_archetype()
… …
631 494
632/* 495/*
633 * Finds which archetype matches the given name, and returns a new 496 * Finds which archetype matches the given name, and returns a new
634 * object containing a copy of the archetype. 497 * object containing a copy of the archetype.
635 */ 498 */
636
637object * 499object *
638get_archetype (const char *name) 500get_archetype (const char *name)
639{ 501{
640 archetype *at = archetype::find (name); 502 archetype *at = archetype::find (name);
641 503
… …
644 506
645 return arch_to_object (at); 507 return arch_to_object (at);
646} 508}
647 509
648/* 510/*
649 * Hash-function used by the arch-hashtable.
650 */
651
652unsigned long
653hasharch (const char *str, int tablesize)
654{
655 unsigned long hash = 0;
656 unsigned int i = 0;
657 const char *p;
658
659 /* use the one-at-a-time hash function, which supposedly is
660 * better than the djb2-like one used by perl5.005, but
661 * certainly is better then the bug used here before.
662 * see http://burtleburtle.net/bob/hash/doobs.html
663 */
664 for (p = str; i < MAXSTRING && *p; p++, i++)
665 {
666 hash += *p;
667 hash += hash << 10;
668 hash ^= hash >> 6;
669 }
670
671 hash += hash << 3;
672 hash ^= hash >> 11;
673 hash += hash << 15;
674
675 return hash % tablesize;
676}
677
678/*
679 * Finds, using the hashtable, which archetype matches the given name. 511 * Finds, using the hashtable, which archetype matches the given name.
680 * returns a pointer to the found archetype, otherwise NULL. 512 * returns a pointer to the found archetype, otherwise NULL.
681 */ 513 */
682
683archetype * 514archetype *
684archetype::find (const char *name) 515archetype::find (const char *name)
685{ 516{
686 if (!name) 517 if (!name)
687 return 0; 518 return 0;
688 519
689#if USE_UNORDERED_MAP 520 auto (i, ht.find (name));
690 AUTODECL (i, ht.find ((size_t) name));
691 521
692 if (i == ht.end ()) 522 if (i == ht.end ())
693 return 0; 523 return 0;
694 else 524 else
695 return i->second; 525 return i->second;
696#endif 526}
697 527
698 archetype *at; 528archetype *
699 unsigned long index; 529archetype::get (const char *name)
700 530{
701 index = hasharch (name, ARCHTABLE); 531 if (!name)
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 } 532 {
533 LOG (llevError, "null archetype requested\n");
534 name = "(null)";
535 }
536
537 archetype *at = find (name);
538
539 if (!at)
540 {
541 archetypes.push_back (at = new archetype);
542 at->name = at->clone.name = at->clone.name_pl = name;
543 at->hash_add ();
544 }
545
546 return at;
723} 547}
724 548
725/* 549/*
726 * Adds an archetype to the hashtable. 550 * Adds an archetype to the hashtable.
727 */ 551 */
728void 552void
729archetype::hash_add () 553archetype::hash_add ()
730{ 554{
731#if USE_UNORDERED_MAP
732 ht.insert (std::make_pair ((size_t) (const char *) name, this)); 555 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} 556}
753 557
754void 558void
755archetype::hash_del () 559archetype::hash_del ()
756{ 560{
757#if USE_UNORDERED_MAP 561 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} 562}
779 563
780/* 564/*
781 * Returns the first archetype using the given type. 565 * Returns the first archetype using the given type.
782 * Used in treasure-generation. 566 * Used in treasure-generation.
783 */ 567 */
784
785archetype * 568archetype *
786type_to_archetype (int type) 569type_to_archetype (int type)
787{ 570{
788 archetype *at;
789
790 for (at = first_archetype; at; at = at->more == 0 ? at->next : at->more) 571 for (archetype *at = first_archetype; at; at = at->more == 0 ? at->next : at->more)
791 if (at->clone.type == type) 572 if (at->clone.type == type)
792 return at; 573 return at;
793 574
794 return 0; 575 return 0;
795} 576}
… …
797/* 578/*
798 * Returns a new object copied from the first archetype matching 579 * Returns a new object copied from the first archetype matching
799 * the given type. 580 * the given type.
800 * Used in treasure-generation. 581 * Used in treasure-generation.
801 */ 582 */
802
803object * 583object *
804clone_arch (int type) 584clone_arch (int type)
805{ 585{
806 archetype *at; 586 archetype *at;
807 587

Diff Legend

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