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.24 by root, Sat Sep 16 22:24:12 2006 UTC vs.
Revision 1.57 by root, Thu Apr 19 19:24:25 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 <tr1/unordered_map>
27
28#include <global.h> 27#include <global.h>
29#include <arch.h>
30#include <funcpoint.h> 28#include <funcpoint.h>
31#include <loader.h> 29#include <loader.h>
32 30
33/* IF set, does a little timing on the archetype load. */ 31#include <tr1/functional>
34#define TIME_ARCH_LOAD 0 32#include <tr1/unordered_map>
35
36static void add_arch (archetype *at);
37
38static archetype *arch_table[ARCHTABLE];
39int arch_cmp = 0; /* How many strcmp's */
40int arch_search = 0; /* How many searches */
41int arch_init; /* True if doing arch initialization */
42 33
43/* The naming of these functions is really poor - they are all 34/* The naming of these functions is really poor - they are all
44 * pretty much named '.._arch_...', but they may more may not 35 * pretty much named '.._arch_...', but they may more may not
45 * return archetypes. Some make the arch_to_object call, and thus 36 * return archetypes. Some make the arch_to_object call, and thus
46 * return an object. Perhaps those should be called 'archob' functions 37 * return an object. Perhaps those should be called 'archob' functions
47 * to denote they return an object derived from the archetype. 38 * to denote they return an object derived from the archetype.
48 * MSW 2003-04-29 39 * MSW 2003-04-29
49 */ 40 */
50 41
51#if USE_UNORDERED_MAP 42bool loading_arch; // ugly flag to object laoder etc. to suppress/request special processing
43
52// the hashtable 44// the hashtable
53typedef std::tr1::unordered_map 45typedef std::tr1::unordered_map
54 < 46 <
55 std::size_t, 47 const char *,
56 archetype *, 48 arch_ptr,
57 std::hash<size_t>, 49 str_hash,
58 std::equal_to<size_t>, 50 str_equal,
59 slice_allocator< std::pair<const std::size_t, archetype *> > 51 slice_allocator< std::pair<const char *const, arch_ptr> >
60 true,
61 > HT; 52 > HT;
62 53
63static HT ht; 54static HT ht (5000);
64#endif 55static std::vector<archetype *> archetypes;
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 at->clone.arch = at;
315
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 0
341 if (f.kw == KW_inherit)
342 {
343 if (archetype *at = find (f.get_str ()))
344 *op = at->clone;
345 else
346 LOG (llevError, "archetype '%s' tries to inherit from non-existent archetype '%s'.\n",
347 &at->name, f.get_str ());
348
349 f.next ();
350 }
351#endif
352
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)
359 break;
360
361 f.next ();
362
363 if (f.kw != KW_object)
364 {
365 f.parse_error ("more object");
366 goto fail;
367 }
368 }
369
370 {
371 archetype *head = parts.front ().first;
372
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 }
389 }
390
391 // sever chain of existing head object
392 for (archetype *more, *at = head; at; at = more)
393 {
394 more = at->more;
395
396 at->head = 0;
397 at->more = 0;
398 }
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;
319 return; 440 return 0;
441}
320 442
321 arch_init = 1; 443/*
322 load_archetypes (); 444 * Initialize global archtype pointers:
323 arch_init = 0; 445 */
446void
447init_archetype_pointers ()
448{
449 ring_arch = archetype::find ("ring");
450 amulet_arch = archetype::find ("amulet");
451 staff_arch = archetype::find ("staff");
452 crown_arch = archetype::find ("crown");
324 empty_archetype = archetype::find ("empty_archetype"); 453 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 add_arch (at);
364
365 LOG (llevDebug, "done\n");
366}
367
368/*
369 * Dumps an archetype to debug-level output.
370 */
371
372void
373dump_arch (archetype *at)
374{
375 dump_object (&at->clone);
376}
377
378/*
379 * Dumps _all_ archetypes to debug-level output.
380 * If you run crossfire with debug, and enter DM-mode, you can trigger
381 * this with the O key.
382 */
383
384void
385dump_all_archetypes (void)
386{
387 archetype *at;
388
389 for (at = first_archetype; at != NULL; at = (at->more == NULL) ? at->next : at->more)
390 {
391 dump_arch (at);
392 fprintf (logfile, "%s\n", errmsg);
393 }
394}
395
396void
397free_all_archs (void)
398{
399 archetype *at, *next;
400 int i = 0, f = 0;
401
402 for (at = first_archetype; at != NULL; at = next)
403 {
404 if (at->more)
405 next = at->more;
406 else
407 next = at->next;
408
409 delete
410 at;
411
412 i++;
413 }
414 LOG (llevDebug, "Freed %d archetypes, %d faces\n", i, f);
415}
416
417archetype::archetype ()
418{
419 clear_object (&clone); /* to initial state other also */
420 CLEAR_FLAG (&clone, FLAG_FREED); /* This shouldn't matter, since copy_object() */
421 SET_FLAG (&clone, FLAG_REMOVED); /* doesn't copy these flags... */
422}
423
424archetype::~archetype ()
425{
426}
427
428/*
429 * Reads/parses the archetype-file, and copies into a linked list
430 * of archetype-structures.
431 */
432void
433first_arch_pass (object_thawer & fp)
434{
435 archetype *at, *head = NULL, *last_more = NULL;
436
437 at->clone.arch = first_archetype = at = new archetype;
438
439 while (int i = load_object (fp, &at->clone, 0))
440 {
441 at->clone.speed_left = (float) (-0.1);
442 /* copy the body_info to the body_used - this is only really
443 * need for monsters, but doesn't hurt to do it for everything.
444 * by doing so, when a monster is created, it has good starting
445 * values for the body_used info, so when items are created
446 * for it, they can be properly equipped.
447 */
448 memcpy (&at->clone.body_used, &at->clone.body_info, sizeof (at->clone.body_info));
449
450 switch (i)
451 {
452 case LL_NORMAL: /* A new archetype, just link it with the previous */
453 if (last_more != NULL)
454 last_more->next = at;
455 if (head != NULL)
456 head->next = at;
457 head = last_more = at;
458#if 0
459 if (!op->type)
460 LOG (llevDebug, " WARNING: Archetype %s has no type info!\n", op->arch->name);
461#endif
462 at->tail_x = 0;
463 at->tail_y = 0;
464 break;
465
466 case LL_MORE: /* Another part of the previous archetype, link it correctly */
467
468 at->head = head;
469 at->clone.head = &head->clone;
470 if (last_more != NULL)
471 {
472 last_more->more = at;
473 last_more->clone.more = &at->clone;
474 }
475 last_more = at;
476
477 /* If this multipart image is still composed of individual small
478 * images, don't set the tail_.. values. We can't use them anyways,
479 * and setting these to zero makes the map sending to the client much
480 * easier as just looking at the head, we know what to do.
481 */
482 if (at->clone.face != head->clone.face)
483 {
484 head->tail_x = 0;
485 head->tail_y = 0;
486 }
487 else
488 {
489 if (at->clone.x > head->tail_x)
490 head->tail_x = at->clone.x;
491 if (at->clone.y > head->tail_y)
492 head->tail_y = at->clone.y;
493 }
494 break;
495
496 }
497
498 at = new archetype;
499
500 at->clone.arch = at;
501 }
502
503 delete at;
504}
505
506/*
507 * Reads the archetype file once more, and links all pointers between
508 * archetypes.
509 */
510
511void
512second_arch_pass (object_thawer & thawer)
513{
514 char buf[MAX_BUF], *variable = buf, *argument, *cp;
515 archetype *at = NULL, *other;
516
517 while (fgets (buf, MAX_BUF, thawer) != NULL)
518 {
519 if (*buf == '#')
520 continue;
521 if ((argument = strchr (buf, ' ')) != NULL)
522 {
523 *argument = '\0', argument++;
524 cp = argument + strlen (argument) - 1;
525 while (isspace (*cp))
526 {
527 *cp = '\0';
528 cp--;
529 }
530 }
531 if (!strcmp ("Object", variable))
532 {
533 if ((at = archetype::find (argument)) == NULL)
534 LOG (llevError, "Warning: failed to find arch %s\n", argument);
535 }
536 else if (!strcmp ("other_arch", variable))
537 {
538 if (at != NULL && at->clone.other_arch == NULL)
539 {
540 if ((other = archetype::find (argument)) == NULL)
541 LOG (llevError, "Warning: failed to find other_arch %s\n", argument);
542 else if (at != NULL)
543 at->clone.other_arch = other;
544 }
545 }
546 else if (!strcmp ("randomitems", variable))
547 {
548 if (at != NULL)
549 {
550 treasurelist *tl = find_treasurelist (argument);
551
552 if (tl == NULL)
553 LOG (llevError, "Failed to link treasure to arch (%s): %s\n", &at->name, argument);
554 else
555 at->clone.randomitems = tl;
556 }
557 }
558 }
559}
560
561#ifdef DEBUG
562void
563check_generators (void)
564{
565 archetype *at;
566
567 for (at = first_archetype; at != NULL; at = at->next)
568 if (QUERY_FLAG (&at->clone, FLAG_GENERATOR) && at->clone.other_arch == NULL)
569 LOG (llevError, "Warning: %s is generator but lacks other_arch.\n", &at->name);
570}
571#endif
572
573/*
574 * First initialises the archtype hash-table (init_archetable()).
575 * Reads and parses the archetype file (with the first and second-pass
576 * functions).
577 * Then initialises treasures by calling load_treasures().
578 */
579
580void
581load_archetypes (void)
582{
583 char filename[MAX_BUF];
584
585#if TIME_ARCH_LOAD
586 struct timeval
587 tv1,
588 tv2;
589#endif
590
591 sprintf (filename, "%s/%s", settings.datadir, settings.archetypes);
592 LOG (llevDebug, "Reading archetypes from %s:\n", filename);
593
594 {
595 object_thawer
596 thawer (filename);
597
598 clear_archetable ();
599 LOG (llevDebug, " arch-pass 1...\n");
600 first_arch_pass (thawer);
601 LOG (llevDebug, " done\n");
602 }
603
604 init_archetable ();
605 warn_archetypes = 1;
606
607 {
608 object_thawer
609 thawer (filename);
610
611 LOG (llevDebug, " loading treasure...\n");
612 load_treasures ();
613 LOG (llevDebug, " done\n arch-pass 2...\n");
614 second_arch_pass (thawer);
615 LOG (llevDebug, " done\n");
616#ifdef DEBUG
617 check_generators ();
618#endif
619 }
620 LOG (llevDebug, " done\n");
621} 454}
622 455
623/* 456/*
624 * 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.
625 * This function returns NULL on failure. 458 * This function returns NULL on failure.
626 */ 459 */
627
628object * 460object *
629arch_to_object (archetype *at) 461arch_to_object (archetype *at)
630{ 462{
631 object *op; 463 if (!at)
632
633 if (at == NULL)
634 { 464 {
635 if (warn_archetypes)
636 LOG (llevError, "Couldn't find archetype.\n"); 465 LOG (llevError, "Couldn't find archetype.\n");
637
638 return NULL; 466 return 0;
639 } 467 }
640 468
641 op = get_object (); 469 object *op = at->clone.clone ();
642 copy_object (&at->clone, op);
643 op->arch = at; 470 op->arch = at;
644 op->instantiate (); 471 op->instantiate ();
472
645 return op; 473 return op;
646} 474}
647 475
648/* 476/*
649 * Creates an object. This function is called by get_archetype() 477 * Creates an object. This function is called by get_archetype()
650 * if it fails to find the appropriate archetype. 478 * if it fails to find the appropriate archetype.
651 * Thus get_archetype() will be guaranteed to always return 479 * Thus get_archetype() will be guaranteed to always return
652 * an object, and never NULL. 480 * an object, and never NULL.
653 */ 481 */
654
655object * 482object *
656create_singularity (const char *name) 483create_singularity (const char *name)
657{ 484{
658 object *op; 485 object *op;
659 char buf[MAX_BUF]; 486 char buf[MAX_BUF];
660 487
661 sprintf (buf, "%s (%s)", ARCH_SINGULARITY, name); 488 sprintf (buf, "%s (%s)", ARCH_SINGULARITY, name);
662 op = get_object (); 489 op = object::create ();
663 op->name = op->name_pl = buf; 490 op->name = op->name_pl = buf;
664 SET_FLAG (op, FLAG_NO_PICK); 491 SET_FLAG (op, FLAG_NO_PICK);
665 return op; 492 return op;
666} 493}
667 494
668/* 495/*
669 * Finds which archetype matches the given name, and returns a new 496 * Finds which archetype matches the given name, and returns a new
670 * object containing a copy of the archetype. 497 * object containing a copy of the archetype.
671 */ 498 */
672
673object * 499object *
674get_archetype (const char *name) 500get_archetype (const char *name)
675{ 501{
676 archetype *at = archetype::find (name); 502 archetype *at = archetype::find (name);
677 503
680 506
681 return arch_to_object (at); 507 return arch_to_object (at);
682} 508}
683 509
684/* 510/*
685 * Hash-function used by the arch-hashtable.
686 */
687
688unsigned long
689hasharch (const char *str, int tablesize)
690{
691 unsigned long hash = 0;
692 unsigned int i = 0;
693 const char *p;
694
695 /* use the one-at-a-time hash function, which supposedly is
696 * better than the djb2-like one used by perl5.005, but
697 * certainly is better then the bug used here before.
698 * see http://burtleburtle.net/bob/hash/doobs.html
699 */
700 for (p = str; i < MAXSTRING && *p; p++, i++)
701 {
702 hash += *p;
703 hash += hash << 10;
704 hash ^= hash >> 6;
705 }
706
707 hash += hash << 3;
708 hash ^= hash >> 11;
709 hash += hash << 15;
710
711 return hash % tablesize;
712}
713
714/*
715 * Finds, using the hashtable, which archetype matches the given name. 511 * Finds, using the hashtable, which archetype matches the given name.
716 * returns a pointer to the found archetype, otherwise NULL. 512 * returns a pointer to the found archetype, otherwise NULL.
717 */ 513 */
718
719archetype * 514archetype *
720archetype::find (const char *name) 515archetype::find (const char *name)
721{ 516{
722 if (!name) 517 if (!name)
723 return 0; 518 return 0;
724 519
725#if USE_UNORDERED_MAP 520 auto (i, ht.find (name));
726 AUTODECL (i, ht.find ((size_t) name));
727 521
728 if (i == ht.end ()) 522 if (i == ht.end ())
729 return 0; 523 return 0;
730 else 524 else
731 return i->second; 525 return i->second;
732#endif 526}
733 527
734 archetype *at; 528archetype *
735 unsigned long index; 529archetype::get (const char *name)
530{
531 archetype *at = find (name);
736 532
737 index = hasharch (name, ARCHTABLE); 533 if (!at)
738 arch_search++;
739 for (;;)
740 {
741 at = arch_table[index];
742
743 if (at == NULL)
744 {
745 if (warn_archetypes)
746 LOG (llevError, "Couldn't find archetype %s\n", name);
747
748 return NULL;
749 }
750
751 arch_cmp++;
752
753 if (!strcmp ((const char *) at->name, name))
754 return at;
755
756 if (++index >= ARCHTABLE)
757 index = 0;
758 } 534 {
535 archetypes.push_back (at = new archetype);
536 at->name = at->clone.name = at->clone.name_pl = name;
537 at->hash_add ();
538 }
539
540 return at;
759} 541}
760 542
761/* 543/*
762 * Adds an archetype to the hashtable. 544 * Adds an archetype to the hashtable.
763 */ 545 */
764 546void
765static void 547archetype::hash_add ()
766add_arch (archetype *at)
767{ 548{
768#if USE_UNORDERED_MAP 549 ht.insert (std::make_pair (name, this));
769 ht.insert (std::make_pair ((size_t) (const char *) at->name, at)); 550}
770#endif
771 551
772 int index = hasharch ((const char *) at->name, ARCHTABLE), org_index = index; 552void
773 553archetype::hash_del ()
774 for (;;) 554{
775 { 555 ht.erase (name);
776 if (arch_table[index] == NULL)
777 {
778 arch_table[index] = at;
779 return;
780 }
781
782 if (++index == ARCHTABLE)
783 index = 0;
784
785 if (index == org_index)
786 fatal (ARCHTABLE_TOO_SMALL);
787 }
788} 556}
789 557
790/* 558/*
791 * Returns the first archetype using the given type. 559 * Returns the first archetype using the given type.
792 * Used in treasure-generation. 560 * Used in treasure-generation.
793 */ 561 */
794
795archetype * 562archetype *
796type_to_archetype (int type) 563type_to_archetype (int type)
797{ 564{
798 archetype *at;
799
800 for (at = first_archetype; at; at = at->more == 0 ? at->next : at->more) 565 for (archetype *at = first_archetype; at; at = at->more == 0 ? at->next : at->more)
801 if (at->clone.type == type) 566 if (at->clone.type == type)
802 return at; 567 return at;
803 568
804 return 0; 569 return 0;
805} 570}
807/* 572/*
808 * Returns a new object copied from the first archetype matching 573 * Returns a new object copied from the first archetype matching
809 * the given type. 574 * the given type.
810 * Used in treasure-generation. 575 * Used in treasure-generation.
811 */ 576 */
812
813object * 577object *
814clone_arch (int type) 578clone_arch (int type)
815{ 579{
816 archetype *at; 580 archetype *at;
817 object *op = get_object ();
818 581
819 if ((at = type_to_archetype (type)) == NULL) 582 if ((at = type_to_archetype (type)) == NULL)
820 { 583 {
821 LOG (llevError, "Can't clone archetype %d\n", type); 584 LOG (llevError, "Can't clone archetype %d\n", type);
822 free_object (op);
823 return NULL; 585 return 0;
824 } 586 }
825 587
826 copy_object (&at->clone, op); 588 object *op = at->clone.clone ();
827 op->instantiate (); 589 op->instantiate ();
828 return op; 590 return op;
829} 591}
830 592
831/* 593/*

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines