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.26 by root, Fri Nov 17 19:40:53 2006 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) 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/* 280archetype::archetype ()
310 * Initialises the internal linked list of archetypes (read from file). 281{
311 * Then the global "empty_archetype" pointer is initialised. 282 clone.arch = this;
312 * Then the blocksview[] array is initialised.
313 */
314 283
284 CLEAR_FLAG (&clone, FLAG_FREED); /* This shouldn't matter, since copy_to */
285 SET_FLAG (&clone, FLAG_REMOVED); /* doesn't copy these flags... */
286}
287
288archetype::~archetype ()
289{
290 //TODO: nuke ->more's
291}
292
293static void
294unlink (archetype *at)
295{
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
315void 310void
316init_archetypes (void) 311overwrite (archetype *at, object *op)
317{ /* called from add_player() and edit() */ 312{
318 if (first_archetype != NULL) /* Only do this once */ 313 at->clone = *op;
314
315 at->clone.arch = at;
316 at->clone.inv = op->inv; op->inv = 0;
317
318 op->destroy ();
319}
320
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 (!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)
351 {
352 f.parse_error ("more object");
353 goto fail;
354 }
355 }
356
357 {
358 archetype *head = parts.front ().first;
359
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 }
376 }
377
378 // sever chain of existing head object
379 for (archetype *more, *at = head; at; at = more)
380 {
381 more = at->more;
382
383 at->head = 0;
384 at->more = 0;
385 }
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;
319 return; 427 return 0;
428}
320 429
321 arch_init = 1; 430/*
322 load_archetypes (); 431 * Initialize global archtype pointers:
323 arch_init = 0; 432 */
433void
434init_archetype_pointers ()
435{
436 ring_arch = archetype::find ("ring");
437 amulet_arch = archetype::find ("amulet");
438 staff_arch = archetype::find ("staff");
439 crown_arch = archetype::find ("crown");
324 empty_archetype = archetype::find ("empty_archetype"); 440 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 ()
391{
392 clear_object (&clone); /* to initial state other also */
393 CLEAR_FLAG (&clone, FLAG_FREED); /* This shouldn't matter, since copy_object() */
394 SET_FLAG (&clone, FLAG_REMOVED); /* doesn't copy these flags... */
395}
396
397archetype::~archetype ()
398{
399}
400
401/*
402 * Reads/parses the archetype-file, and copies into a linked list
403 * of archetype-structures.
404 */
405void
406first_arch_pass (object_thawer & fp)
407{
408 archetype *at, *head = NULL, *last_more = NULL;
409
410 at->clone.arch = first_archetype = at = new archetype;
411
412 while (int i = load_object (fp, &at->clone, 0))
413 {
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)
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 }
470
471 at = new archetype;
472
473 at->clone.arch = at;
474 }
475
476 delete at;
477}
478
479/*
480 * Reads the archetype file once more, and links all pointers between
481 * archetypes.
482 */
483
484void
485second_arch_pass (object_thawer & thawer)
486{
487 char buf[MAX_BUF], *variable = buf, *argument, *cp;
488 archetype *at = NULL, *other;
489
490 while (fgets (buf, MAX_BUF, thawer) != NULL)
491 {
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} 441}
589 442
590/* 443/*
591 * 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.
592 * This function returns NULL on failure. 445 * This function returns NULL on failure.
593 */ 446 */
594
595object * 447object *
596arch_to_object (archetype *at) 448arch_to_object (archetype *at)
597{ 449{
598 object *op; 450 if (!at)
599
600 if (at == NULL)
601 { 451 {
602 if (warn_archetypes)
603 LOG (llevError, "Couldn't find archetype.\n"); 452 LOG (llevError, "Couldn't find archetype.\n");
604
605 return NULL; 453 return 0;
606 } 454 }
607 455
608 op = get_object (); 456 object *op = at->clone.clone ();
609 copy_object (&at->clone, op);
610 op->arch = at; 457 op->arch = at;
611 op->instantiate (); 458 op->instantiate ();
459
612 return op; 460 return op;
613} 461}
614 462
615/* 463/*
616 * Creates an object. This function is called by get_archetype() 464 * Creates an object. This function is called by get_archetype()
617 * if it fails to find the appropriate archetype. 465 * if it fails to find the appropriate archetype.
618 * Thus get_archetype() will be guaranteed to always return 466 * Thus get_archetype() will be guaranteed to always return
619 * an object, and never NULL. 467 * an object, and never NULL.
620 */ 468 */
621
622object * 469object *
623create_singularity (const char *name) 470create_singularity (const char *name)
624{ 471{
625 object *op; 472 object *op;
626 char buf[MAX_BUF]; 473 char buf[MAX_BUF];
627 474
628 sprintf (buf, "%s (%s)", ARCH_SINGULARITY, name); 475 sprintf (buf, "%s (%s)", ARCH_SINGULARITY, name);
629 op = get_object (); 476 op = object::create ();
630 op->name = op->name_pl = buf; 477 op->name = op->name_pl = buf;
631 SET_FLAG (op, FLAG_NO_PICK); 478 SET_FLAG (op, FLAG_NO_PICK);
632 return op; 479 return op;
633} 480}
634 481
635/* 482/*
636 * Finds which archetype matches the given name, and returns a new 483 * Finds which archetype matches the given name, and returns a new
637 * object containing a copy of the archetype. 484 * object containing a copy of the archetype.
638 */ 485 */
639
640object * 486object *
641get_archetype (const char *name) 487get_archetype (const char *name)
642{ 488{
643 archetype *at = archetype::find (name); 489 archetype *at = archetype::find (name);
644 490
647 493
648 return arch_to_object (at); 494 return arch_to_object (at);
649} 495}
650 496
651/* 497/*
652 * Hash-function used by the arch-hashtable.
653 */
654
655unsigned long
656hasharch (const char *str, int tablesize)
657{
658 unsigned long hash = 0;
659 unsigned int i = 0;
660 const char *p;
661
662 /* use the one-at-a-time hash function, which supposedly is
663 * better than the djb2-like one used by perl5.005, but
664 * certainly is better then the bug used here before.
665 * see http://burtleburtle.net/bob/hash/doobs.html
666 */
667 for (p = str; i < MAXSTRING && *p; p++, i++)
668 {
669 hash += *p;
670 hash += hash << 10;
671 hash ^= hash >> 6;
672 }
673
674 hash += hash << 3;
675 hash ^= hash >> 11;
676 hash += hash << 15;
677
678 return hash % tablesize;
679}
680
681/*
682 * Finds, using the hashtable, which archetype matches the given name. 498 * Finds, using the hashtable, which archetype matches the given name.
683 * returns a pointer to the found archetype, otherwise NULL. 499 * returns a pointer to the found archetype, otherwise NULL.
684 */ 500 */
685
686archetype * 501archetype *
687archetype::find (const char *name) 502archetype::find (const char *name)
688{ 503{
689 if (!name) 504 if (!name)
690 return 0; 505 return 0;
691 506
692#if USE_UNORDERED_MAP 507 auto (i, ht.find (name));
693 AUTODECL (i, ht.find ((size_t) name));
694 508
695 if (i == ht.end ()) 509 if (i == ht.end ())
696 return 0; 510 return 0;
697 else 511 else
698 return i->second; 512 return i->second;
699#endif 513}
700 514
701 archetype *at; 515archetype *
702 unsigned long index; 516archetype::get (const char *name)
517{
518 archetype *at = find (name);
703 519
704 index = hasharch (name, ARCHTABLE); 520 if (!at)
705 arch_search++;
706 for (;;)
707 {
708 at = arch_table[index];
709
710 if (at == NULL)
711 {
712 if (warn_archetypes)
713 LOG (llevError, "Couldn't find archetype %s\n", name);
714
715 return NULL;
716 }
717
718 arch_cmp++;
719
720 if (!strcmp ((const char *) at->name, name))
721 return at;
722
723 if (++index >= ARCHTABLE)
724 index = 0;
725 } 521 {
522 archetypes.push_back (at = new archetype);
523 at->name = name;
524 at->hash_add ();
525 }
526
527 return at;
726} 528}
727 529
728/* 530/*
729 * Adds an archetype to the hashtable. 531 * Adds an archetype to the hashtable.
730 */ 532 */
731void 533void
732archetype::hash_add () 534archetype::hash_add ()
733{ 535{
734#if USE_UNORDERED_MAP
735 ht.insert (std::make_pair ((size_t) (const char *) name, this)); 536 ht.insert (std::make_pair (name, this));
736#else
737
738 int index = hasharch ((const char *) name, ARCHTABLE), org_index = index;
739
740 for (;;)
741 {
742 if (!arch_table[index])
743 {
744 arch_table[index] = this;
745 break;
746 }
747
748 if (++index == ARCHTABLE)
749 index = 0;
750
751 if (index == org_index)
752 fatal (ARCHTABLE_TOO_SMALL);
753 }
754#endif
755} 537}
756 538
757void 539void
758archetype::hash_del () 540archetype::hash_del ()
759{ 541{
760#if USE_UNORDERED_MAP 542 ht.erase (name);
761# error remove this from HT
762#else
763
764 int index = hasharch ((const char *) name, ARCHTABLE), org_index = index;
765
766 for (;;)
767 {
768 if (arch_table[index] == this)
769 {
770 arch_table[index] = 0;
771 break;
772 }
773
774 if (++index == ARCHTABLE)
775 index = 0;
776
777 if (index == org_index)
778 break;
779 }
780#endif
781} 543}
782 544
783/* 545/*
784 * Returns the first archetype using the given type. 546 * Returns the first archetype using the given type.
785 * Used in treasure-generation. 547 * Used in treasure-generation.
786 */ 548 */
787
788archetype * 549archetype *
789type_to_archetype (int type) 550type_to_archetype (int type)
790{ 551{
791 archetype *at;
792
793 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)
794 if (at->clone.type == type) 553 if (at->clone.type == type)
795 return at; 554 return at;
796 555
797 return 0; 556 return 0;
798} 557}
800/* 559/*
801 * Returns a new object copied from the first archetype matching 560 * Returns a new object copied from the first archetype matching
802 * the given type. 561 * the given type.
803 * Used in treasure-generation. 562 * Used in treasure-generation.
804 */ 563 */
805
806object * 564object *
807clone_arch (int type) 565clone_arch (int type)
808{ 566{
809 archetype *at; 567 archetype *at;
810 object *op = get_object ();
811 568
812 if ((at = type_to_archetype (type)) == NULL) 569 if ((at = type_to_archetype (type)) == NULL)
813 { 570 {
814 LOG (llevError, "Can't clone archetype %d\n", type); 571 LOG (llevError, "Can't clone archetype %d\n", type);
815 free_object (op);
816 return NULL; 572 return 0;
817 } 573 }
818 574
819 copy_object (&at->clone, op); 575 object *op = at->clone.clone ();
820 op->instantiate (); 576 op->instantiate ();
821 return op; 577 return op;
822} 578}
823 579
824/* 580/*

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines