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.25 by root, Tue Nov 7 16:30:54 2006 UTC vs.
Revision 1.49 by root, Mon Apr 16 12:37:08 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() */
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{ 312{
337 sprintf (errmsg, "%d searches and %d strcmp()'s", arch_search, arch_cmp); 313 at->clone = *op;
338 new_draw_info (NDI_BLACK, 0, op, errmsg); 314
339} 315 at->clone.arch = at;
316 at->clone.inv = op->inv; op->inv = 0;
340 317
341/* 318 op->destroy ();
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} 319}
350 320
351/* 321bool
352 * An alternative way to init the hashtable which is slower, but _works_... 322archetype::load (object_thawer &f)
353 */
354
355void
356init_archetable (void)
357{ 323{
358 archetype *at; 324 assert (f.kw == KW_object);
359 325
360 LOG (llevDebug, " Setting up archetable...\n"); 326 typedef std::pair<archetype *, object *> part;
327 std::vector<part> parts;
361 328
362 for (at = first_archetype; at != NULL; at = (at->more == NULL) ? at->next : at->more) 329 for (;;)
363 add_arch (at); 330 {
331 archetype *at = get (f.get_str ());
332 object *op = object::create ();
364 333
365 LOG (llevDebug, "done\n"); 334 if (!op->parse_kv (f))
366} 335 goto fail;
367 336
368void 337 parts.push_back (std::make_pair (at, op));
369free_all_archs (void)
370{
371 archetype *at, *next;
372 int i = 0, f = 0;
373 338
374 for (at = first_archetype; at != NULL; at = next) 339 if (f.kw != KW_more)
340 break;
341
342 f.next ();
343 assert (f.kw == KW_object);
344 }
345
346 {
347 archetype *head = parts.front ().first;
348
349 // check that all archetypes belong to the same object or are heads
350 for (AUTODECL (p, parts.begin ()); p != parts.end (); ++p)
375 { 351 {
376 if (at->more) 352 archetype *at = p->first;
353
354 if (at->head != head && at->head)
355 {
356 LOG (llevError, "%s: unable to overwrite foreign non-head archetype with non-head archetype\n", &at->name);
357 goto fail;
358 }
359
360 if (at->next && at != head)
361 {
362 LOG (llevError, "%s: unable to overwrite foreign head archetype with non-head archetype\n", &at->name);
363 goto fail;
364 }
365 }
366
367 // sever chain of existing head object
368 for (archetype *more, *at = head; at; at = more)
369 {
377 next = at->more; 370 more = at->more;
378 else
379 next = at->next;
380 371
381 delete 372 at->head = 0;
382 at; 373 at->more = 0;
383
384 i++;
385 } 374 }
386 LOG (llevDebug, "Freed %d archetypes, %d faces\n", i, f);
387}
388 375
389archetype::archetype () 376 // replace/update head
390{ 377 overwrite (head, parts.front ().second);
391 clear_object (&clone); /* to initial state other also */ 378 head->tail_x = 0;
392 CLEAR_FLAG (&clone, FLAG_FREED); /* This shouldn't matter, since copy_object() */ 379 head->tail_y = 0;
393 SET_FLAG (&clone, FLAG_REMOVED); /* doesn't copy these flags... */
394}
395 380
396archetype::~archetype () 381 // link into list of heads, if not already there
397{ 382 if (!head->next)
383 {
384 head->next = first_archetype;
385 first_archetype = head;
386 }
387
388 // reassemble new chain
389 archetype *prev = head;
390 for (AUTODECL (p, parts.begin () + 1); p != parts.end (); ++p)
391 {
392 archetype *at = p->first;
393 overwrite (at, p->second);
394
395 if (at->clone.x > head->tail_x) head->tail_x = at->clone.x;
396 if (at->clone.y > head->tail_y) head->tail_y = at->clone.y;
397
398 at->head = head;
399 at->clone.head = &head->clone;
400 prev->more = at;
401 prev->clone.more = &at->clone;
402
403 prev = at;
404 }
405 }
406
407 return true;
408
409fail:
410 for (AUTODECL (p, parts.begin ()); p != parts.end (); ++p)
411 p->second->destroy (true);
412
413 return false;
398} 414}
399 415
400/* 416/*
401 * Reads/parses the archetype-file, and copies into a linked list 417 * Reads/parses the archetype-file, and copies into a linked list
402 * of archetype-structures. 418 * of archetype-structures.
403 */ 419 */
404void 420static bool
405first_arch_pass (object_thawer & fp) 421load_archetypes (object_thawer &f)
406{ 422{
407 archetype *at, *head = NULL, *last_more = NULL; 423 for (;;)
408
409 at->clone.arch = first_archetype = at = new archetype;
410
411 while (int i = load_object (fp, &at->clone, 0))
412 { 424 {
413 at->clone.speed_left = (float) (-0.1);
414 /* copy the body_info to the body_used - this is only really
415 * need for monsters, but doesn't hurt to do it for everything.
416 * by doing so, when a monster is created, it has good starting
417 * values for the body_used info, so when items are created
418 * for it, they can be properly equipped.
419 */
420 memcpy (&at->clone.body_used, &at->clone.body_info, sizeof (at->clone.body_info));
421
422 switch (i) 425 switch (f.kw)
423 { 426 {
424 case LL_NORMAL: /* A new archetype, just link it with the previous */ 427 case KW_object:
425 if (last_more != NULL) 428 loading_arch = true;
426 last_more->next = at; 429 if (!archetype::load (f))
427 if (head != NULL)
428 head->next = at;
429 head = last_more = at;
430#if 0
431 if (!op->type)
432 LOG (llevDebug, " WARNING: Archetype %s has no type info!\n", op->arch->name);
433#endif
434 at->tail_x = 0;
435 at->tail_y = 0;
436 break;
437
438 case LL_MORE: /* Another part of the previous archetype, link it correctly */
439
440 at->head = head;
441 at->clone.head = &head->clone;
442 if (last_more != NULL)
443 { 430 {
444 last_more->more = at; 431 loading_arch = false;
445 last_more->clone.more = &at->clone; 432 return false;
446 } 433 }
447 last_more = at;
448 434
449 /* If this multipart image is still composed of individual small 435 loading_arch = false;
450 * images, don't set the tail_.. values. We can't use them anyways, 436 continue;
451 * and setting these to zero makes the map sending to the client much 437
452 * easier as just looking at the head, we know what to do. 438 case KW_EOF:
453 */ 439 return true;
454 if (at->clone.face != head->clone.face) 440
455 { 441 default:
456 head->tail_x = 0; 442 if (!f.parse_error ("archetypes file"))
457 head->tail_y = 0;
458 }
459 else 443 return false;
460 {
461 if (at->clone.x > head->tail_x)
462 head->tail_x = at->clone.x;
463 if (at->clone.y > head->tail_y)
464 head->tail_y = at->clone.y;
465 }
466 break;
467
468 } 444 }
469 445
470 at = new archetype; 446 f.next ();
471
472 at->clone.arch = at;
473 }
474
475 delete at;
476}
477
478/*
479 * Reads the archetype file once more, and links all pointers between
480 * archetypes.
481 */
482
483void
484second_arch_pass (object_thawer & thawer)
485{
486 char buf[MAX_BUF], *variable = buf, *argument, *cp;
487 archetype *at = NULL, *other;
488
489 while (fgets (buf, MAX_BUF, thawer) != NULL)
490 { 447 }
491 if (*buf == '#')
492 continue;
493 if ((argument = strchr (buf, ' ')) != NULL)
494 {
495 *argument = '\0', argument++;
496 cp = argument + strlen (argument) - 1;
497 while (isspace (*cp))
498 {
499 *cp = '\0';
500 cp--;
501 }
502 }
503 if (!strcmp ("Object", variable))
504 {
505 if ((at = archetype::find (argument)) == NULL)
506 LOG (llevError, "Warning: failed to find arch %s\n", argument);
507 }
508 else if (!strcmp ("other_arch", variable))
509 {
510 if (at != NULL && at->clone.other_arch == NULL)
511 {
512 if ((other = archetype::find (argument)) == NULL)
513 LOG (llevError, "Warning: failed to find other_arch %s\n", argument);
514 else if (at != NULL)
515 at->clone.other_arch = other;
516 }
517 }
518 else if (!strcmp ("randomitems", variable))
519 {
520 if (at != NULL)
521 {
522 treasurelist *tl = find_treasurelist (argument);
523
524 if (tl == NULL)
525 LOG (llevError, "Failed to link treasure to arch (%s): %s\n", &at->name, argument);
526 else
527 at->clone.randomitems = tl;
528 }
529 }
530 }
531} 448}
532
533#ifdef DEBUG
534void
535check_generators (void)
536{
537 archetype *at;
538
539 for (at = first_archetype; at != NULL; at = at->next)
540 if (QUERY_FLAG (&at->clone, FLAG_GENERATOR) && at->clone.other_arch == NULL)
541 LOG (llevError, "Warning: %s is generator but lacks other_arch.\n", &at->name);
542}
543#endif
544 449
545/* 450/*
546 * First initialises the archtype hash-table (init_archetable()). 451 * First initialises the archtype hash-table (init_archetable()).
547 * Reads and parses the archetype file (with the first and second-pass 452 * Reads and parses the archetype file (with the first and second-pass
548 * functions). 453 * functions).
549 * Then initialises treasures by calling load_treasures().
550 */ 454 */
551 455bool
552void 456load_archetype_file (const char *filename)
553load_archetypes (void)
554{ 457{
555 char filename[MAX_BUF];
556
557#if TIME_ARCH_LOAD
558 struct timeval
559 tv1,
560 tv2;
561#endif
562
563 sprintf (filename, "%s/%s", settings.datadir, settings.archetypes);
564 LOG (llevDebug, "Reading archetypes from %s:\n", filename);
565
566 {
567 object_thawer
568 thawer (filename); 458 object_thawer f (filename);
569 459
570 clear_archetable (); 460 f.next ();
571 LOG (llevDebug, " arch-pass 1...\n");
572 first_arch_pass (thawer);
573 LOG (llevDebug, " done\n");
574 }
575 461
576 init_archetable (); 462 // make sure the next - long - step is only done after a tick
463 coroapi::wait_for_tick_begin ();
464
465 if (!load_archetypes (f))
466 return false;
467
577 warn_archetypes = 1; 468 warn_archetypes = 1;
578 469
579 { 470 empty_archetype = archetype::find ("empty_archetype");
580 object_thawer 471 if (!empty_archetype)
581 thawer (filename); 472 return false;
582 473
583 LOG (llevDebug, " loading treasure...\n"); 474 coroapi::cede ();
584 load_treasures (); 475
585 LOG (llevDebug, " done\n arch-pass 2...\n"); 476 return true;
586 second_arch_pass (thawer);
587 LOG (llevDebug, " done\n");
588#ifdef DEBUG
589 check_generators ();
590#endif
591 }
592 LOG (llevDebug, " done\n");
593} 477}
594 478
595/* 479/*
596 * Creates and returns a new object which is a copy of the given archetype. 480 * Creates and returns a new object which is a copy of the given archetype.
597 * This function returns NULL on failure. 481 * This function returns NULL on failure.
598 */ 482 */
599
600object * 483object *
601arch_to_object (archetype *at) 484arch_to_object (archetype *at)
602{ 485{
603 object *op; 486 if (!at)
604
605 if (at == NULL)
606 { 487 {
607 if (warn_archetypes) 488 if (warn_archetypes)
608 LOG (llevError, "Couldn't find archetype.\n"); 489 LOG (llevError, "Couldn't find archetype.\n");
609 490
610 return NULL; 491 return NULL;
611 } 492 }
612 493
613 op = get_object (); 494 object *op = at->clone.clone ();
614 copy_object (&at->clone, op);
615 op->arch = at; 495 op->arch = at;
616 op->instantiate (); 496 op->instantiate ();
617 return op; 497 return op;
618} 498}
619 499
… …
621 * Creates an object. This function is called by get_archetype() 501 * Creates an object. This function is called by get_archetype()
622 * if it fails to find the appropriate archetype. 502 * if it fails to find the appropriate archetype.
623 * Thus get_archetype() will be guaranteed to always return 503 * Thus get_archetype() will be guaranteed to always return
624 * an object, and never NULL. 504 * an object, and never NULL.
625 */ 505 */
626
627object * 506object *
628create_singularity (const char *name) 507create_singularity (const char *name)
629{ 508{
630 object *op; 509 object *op;
631 char buf[MAX_BUF]; 510 char buf[MAX_BUF];
632 511
633 sprintf (buf, "%s (%s)", ARCH_SINGULARITY, name); 512 sprintf (buf, "%s (%s)", ARCH_SINGULARITY, name);
634 op = get_object (); 513 op = object::create ();
635 op->name = op->name_pl = buf; 514 op->name = op->name_pl = buf;
636 SET_FLAG (op, FLAG_NO_PICK); 515 SET_FLAG (op, FLAG_NO_PICK);
637 return op; 516 return op;
638} 517}
639 518
640/* 519/*
641 * Finds which archetype matches the given name, and returns a new 520 * Finds which archetype matches the given name, and returns a new
642 * object containing a copy of the archetype. 521 * object containing a copy of the archetype.
643 */ 522 */
644
645object * 523object *
646get_archetype (const char *name) 524get_archetype (const char *name)
647{ 525{
648 archetype *at = archetype::find (name); 526 archetype *at = archetype::find (name);
649 527
… …
685 563
686/* 564/*
687 * Finds, using the hashtable, which archetype matches the given name. 565 * Finds, using the hashtable, which archetype matches the given name.
688 * returns a pointer to the found archetype, otherwise NULL. 566 * returns a pointer to the found archetype, otherwise NULL.
689 */ 567 */
690
691archetype * 568archetype *
692archetype::find (const char *name) 569archetype::find (const char *name)
693{ 570{
694 if (!name) 571 if (!name)
695 return 0; 572 return 0;
696 573
697#if USE_UNORDERED_MAP
698 AUTODECL (i, ht.find ((size_t) name)); 574 AUTODECL (i, ht.find (name));
699 575
700 if (i == ht.end ()) 576 if (i == ht.end ())
701 return 0; 577 return 0;
702 else 578 else
703 return i->second; 579 return i->second;
704#endif 580}
705 581
706 archetype *at; 582archetype *
707 unsigned long index; 583archetype::get (const char *name)
584{
585 archetype *at = find (name);
708 586
709 index = hasharch (name, ARCHTABLE); 587 if (!at)
710 arch_search++;
711 for (;;)
712 {
713 at = arch_table[index];
714
715 if (at == NULL)
716 {
717 if (warn_archetypes)
718 LOG (llevError, "Couldn't find archetype %s\n", name);
719
720 return NULL;
721 }
722
723 arch_cmp++;
724
725 if (!strcmp ((const char *) at->name, name))
726 return at;
727
728 if (++index >= ARCHTABLE)
729 index = 0;
730 } 588 {
589 archetypes.push_back (at = new archetype);
590 at->name = name;
591 at->hash_add ();
592 }
593
594 return at;
731} 595}
732 596
733/* 597/*
734 * Adds an archetype to the hashtable. 598 * Adds an archetype to the hashtable.
735 */ 599 */
736 600void
737static void 601archetype::hash_add ()
738add_arch (archetype *at)
739{ 602{
740#if USE_UNORDERED_MAP 603 ht.insert (std::make_pair (name, this));
741 ht.insert (std::make_pair ((size_t) (const char *) at->name, at)); 604}
742#endif
743 605
744 int index = hasharch ((const char *) at->name, ARCHTABLE), org_index = index; 606void
745 607archetype::hash_del ()
746 for (;;) 608{
747 { 609 ht.erase (name);
748 if (arch_table[index] == NULL)
749 {
750 arch_table[index] = at;
751 return;
752 }
753
754 if (++index == ARCHTABLE)
755 index = 0;
756
757 if (index == org_index)
758 fatal (ARCHTABLE_TOO_SMALL);
759 }
760} 610}
761 611
762/* 612/*
763 * Returns the first archetype using the given type. 613 * Returns the first archetype using the given type.
764 * Used in treasure-generation. 614 * Used in treasure-generation.
765 */ 615 */
766
767archetype * 616archetype *
768type_to_archetype (int type) 617type_to_archetype (int type)
769{ 618{
770 archetype *at;
771
772 for (at = first_archetype; at; at = at->more == 0 ? at->next : at->more) 619 for (archetype *at = first_archetype; at; at = at->more == 0 ? at->next : at->more)
773 if (at->clone.type == type) 620 if (at->clone.type == type)
774 return at; 621 return at;
775 622
776 return 0; 623 return 0;
777} 624}
… …
779/* 626/*
780 * Returns a new object copied from the first archetype matching 627 * Returns a new object copied from the first archetype matching
781 * the given type. 628 * the given type.
782 * Used in treasure-generation. 629 * Used in treasure-generation.
783 */ 630 */
784
785object * 631object *
786clone_arch (int type) 632clone_arch (int type)
787{ 633{
788 archetype *at; 634 archetype *at;
789 object *op = get_object ();
790 635
791 if ((at = type_to_archetype (type)) == NULL) 636 if ((at = type_to_archetype (type)) == NULL)
792 { 637 {
793 LOG (llevError, "Can't clone archetype %d\n", type); 638 LOG (llevError, "Can't clone archetype %d\n", type);
794 free_object (op);
795 return NULL; 639 return 0;
796 } 640 }
797 641
798 copy_object (&at->clone, op); 642 object *op = at->clone.clone ();
799 op->instantiate (); 643 op->instantiate ();
800 return op; 644 return op;
801} 645}
802 646
803/* 647/*

Diff Legend

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