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.29 by root, Tue Dec 12 21:39:56 2006 UTC vs.
Revision 1.43 by root, Fri Feb 16 19:43:40 2007 UTC

1/* 1/*
2 CrossFire, A Multiplayer game for X-windows 2 * CrossFire, A Multiplayer game for X-windows
3 3 *
4 * Copyright (C) 2005, 2006, 2007 Marc Lehmann & Crossfire+ Development Team
4 Copyright (C) 2002 Mark Wedel & Crossfire Development Team 5 * Copyright (C) 2002 Mark Wedel & Crossfire Development Team
5 Copyright (C) 1992 Frank Tore Johansen 6 * Copyright (C) 1992 Frank Tore Johansen
6 7 *
7 This program is free software; you can redistribute it and/or modify 8 * This program is free software; you can redistribute it and/or modify
8 it under the terms of the GNU General Public License as published by 9 * it under the terms of the GNU General Public License as published by
9 the Free Software Foundation; either version 2 of the License, or 10 * the Free Software Foundation; either version 2 of the License, or
10 (at your option) any later version. 11 * (at your option) any later version.
11 12 *
12 This program is distributed in the hope that it will be useful, 13 * This program is distributed in the hope that it will be useful,
13 but WITHOUT ANY WARRANTY; without even the implied warranty of 14 * but WITHOUT ANY WARRANTY; without even the implied warranty of
14 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the 15 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
15 GNU General Public License for more details. 16 * GNU General Public License for more details.
16 17 *
17 You should have received a copy of the GNU General Public License 18 * You should have received a copy of the GNU General Public License
18 along with this program; if not, write to the Free Software 19 * along with this program; if not, write to the Free Software
19 Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. 20 * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
20 21 *
21 The authors can be reached via e-mail at <crossfire@schmorp.de> 22 * The authors can be reached via e-mail at <crossfire@schmorp.de>
22*/ 23 */
23 24
24#include <cassert> 25#include <cassert>
25 26
26#include <global.h> 27#include <global.h>
27#include <funcpoint.h> 28#include <funcpoint.h>
28#include <loader.h> 29#include <loader.h>
29 30
30#define USE_UNORDERED_MAP 0
31
32#if USE_UNORDERED_MAP
33# include <tr1/functional> 31#include <tr1/functional>
34# include <tr1/unordered_map> 32#include <tr1/unordered_map>
35#endif
36 33
37int arch_cmp = 0; /* How many strcmp's */
38int arch_search = 0; /* How many searches */
39int arch_init; /* True if doing arch initialization */ 34int arch_init; /* True if doing arch initialization */
40 35
41/* The naming of these functions is really poor - they are all 36/* The naming of these functions is really poor - they are all
42 * pretty much named '.._arch_...', but they may more may not 37 * pretty much named '.._arch_...', but they may more may not
43 * return archetypes. Some make the arch_to_object call, and thus 38 * return archetypes. Some make the arch_to_object call, and thus
44 * return an object. Perhaps those should be called 'archob' functions 39 * return an object. Perhaps those should be called 'archob' functions
45 * to denote they return an object derived from the archetype. 40 * to denote they return an object derived from the archetype.
46 * MSW 2003-04-29 41 * MSW 2003-04-29
47 */ 42 */
48 43
49#if USE_UNORDERED_MAP
50// the hashtable 44// the hashtable
51typedef std::tr1::unordered_map 45typedef std::tr1::unordered_map
52 < 46 <
53 std::size_t, 47 const char *,
54 arch_ptr, 48 arch_ptr,
55 std::tr1::hash<size_t>, 49 str_hash,
56 std::equal_to<size_t>, 50 str_equal,
57 slice_allocator< std::pair<const std::size_t, archetype *> > 51 slice_allocator< std::pair<const char *const, arch_ptr> >
58 true,
59 > HT; 52 > HT;
60 53
61static HT ht; 54static HT ht (5000);
62#else
63static arch_ptr arch_table[ARCHTABLE];
64#endif
65 55
66/** 56/**
67 * GROS - This function retrieves an archetype given the name that appears 57 * GROS - This function retrieves an archetype given the name that appears
68 * during the game (for example, "writing pen" instead of "stylus"). 58 * during the game (for example, "writing pen" instead of "stylus").
69 * It does not use the hashtable system, but browse the whole archlist each time. 59 * It does not use the hashtable system, but browse the whole archlist each time.
… …
75 * - the archetype found or null if nothing was found. 65 * - the archetype found or null if nothing was found.
76 */ 66 */
77archetype * 67archetype *
78find_archetype_by_object_name (const char *name) 68find_archetype_by_object_name (const char *name)
79{ 69{
80 archetype *at; 70 shstr_cmp name_cmp (name);
81 71
82 if (name == NULL)
83 return (archetype *) NULL;
84
85 for (at = first_archetype; at != NULL; at = at->next) 72 for (archetype *at = first_archetype; at; at = at->next)
86 { 73 if (at->clone.name == name_cmp)
87 if (!strcmp (at->clone.name, name))
88 return at; 74 return at;
89 } 75
90 return NULL; 76 return 0;
91} 77}
92 78
93/** 79/**
94 * This function retrieves an archetype by type and name that appears during 80 * This function retrieves an archetype by type and name that appears during
95 * the game. It is basically the same as find_archetype_by_object_name() 81 * the game. It is basically the same as find_archetype_by_object_name()
96 * except that it considers only items of the given type. 82 * except that it considers only items of the given type.
97 */ 83 */
98archetype * 84archetype *
99find_archetype_by_object_type_name (int type, const char *name) 85find_archetype_by_object_type_name (int type, const char *name)
100{ 86{
101 archetype *at; 87 shstr_cmp name_cmp (name);
102 88
103 if (name == NULL)
104 return NULL;
105
106 for (at = first_archetype; at != NULL; at = at->next) 89 for (archetype *at = first_archetype; at; at = at->next)
107 { 90 if (at->clone.name == name_cmp && at->clone.type == type)
108 if (at->clone.type == type && strcmp (at->clone.name, name) == 0)
109 return at; 91 return at;
110 }
111 92
112 return NULL; 93 return 0;
113} 94}
114 95
115/* This is a lot like the above function. Instead, we are trying to match 96/* This is a lot like the above function. Instead, we are trying to match
116 * the arch->skill values. type is the type of object to match 97 * the arch->skill values. type is the type of object to match
117 * against (eg, to only match against skills or only skill objects for example). 98 * against (eg, to only match against skills or only skill objects for example).
118 * If type is -1, ew don't match on type. 99 * If type is -1, ew don't match on type.
119 */ 100 */
120object * 101object *
121get_archetype_by_skill_name (const char *skill, int type) 102get_archetype_by_skill_name (const char *skill, int type)
122{ 103{
123 archetype * 104 shstr_cmp skill_cmp (skill);
124 at;
125 105
126 if (skill == NULL)
127 return NULL;
128
129 for (at = first_archetype; at != NULL; at = at->next) 106 for (archetype *at = first_archetype; at; at = at->next)
130 { 107 if (at->clone.skill == skill_cmp && (type == -1 || type == at->clone.type))
131 if (((type == -1) || (type == at->clone.type)) && (!strcmp (at->clone.skill, skill)))
132 return arch_to_object (at); 108 return arch_to_object (at);
133 } 109
134 return NULL; 110 return 0;
135} 111}
136 112
137/* similiar to above - this returns the first archetype 113/* similiar to above - this returns the first archetype
138 * that matches both the type and subtype. type and subtype 114 * that matches both the type and subtype. type and subtype
139 * can be -1 to say ignore, but in this case, the match it does 115 * can be -1 to say ignore, but in this case, the match it does
… …
142 * (eg, skills) 118 * (eg, skills)
143 */ 119 */
144archetype * 120archetype *
145get_archetype_by_type_subtype (int type, int subtype) 121get_archetype_by_type_subtype (int type, int subtype)
146{ 122{
147 archetype *
148 at;
149
150 for (at = first_archetype; at != NULL; at = at->next) 123 for (archetype *at = first_archetype; at; at = at->next)
151 {
152 if (((type == -1) || (type == at->clone.type)) && (subtype == -1 || subtype == at->clone.subtype)) 124 if ((type == -1 || type == at->clone.type) && (subtype == -1 || subtype == at->clone.subtype))
153 return at; 125 return at;
154 } 126
155 return NULL; 127 return 0;
156} 128}
157 129
158/** 130/**
159 * GROS - this returns a new object given the name that appears during the game 131 * GROS - this returns a new object given the name that appears during the game
160 * (for example, "writing pen" instead of "stylus"). 132 * (for example, "writing pen" instead of "stylus").
… …
168 * but it otherwise had a big memory leak. 140 * but it otherwise had a big memory leak.
169 */ 141 */
170object * 142object *
171get_archetype_by_object_name (const char *name) 143get_archetype_by_object_name (const char *name)
172{ 144{
173 archetype *at;
174 char tmpname[MAX_BUF]; 145 char tmpname[MAX_BUF];
175 int i; 146 int i;
176 147
177 assign (tmpname, name); 148 assign (tmpname, name);
178 149
179 for (i = strlen (tmpname); i > 0; i--) 150 for (i = strlen (tmpname); i > 0; i--)
180 { 151 {
181 tmpname[i] = 0; 152 tmpname[i] = 0;
153
182 at = find_archetype_by_object_name (tmpname); 154 if (archetype *at = find_archetype_by_object_name (tmpname))
183
184 if (at != NULL)
185 return arch_to_object (at); 155 return arch_to_object (at);
186 } 156 }
187 157
188 return create_singularity (name); 158 return create_singularity (name);
189} 159}
… …
209item_matched_string (object *pl, object *op, const char *name) 179item_matched_string (object *pl, object *op, const char *name)
210{ 180{
211 char *cp, local_name[MAX_BUF]; 181 char *cp, local_name[MAX_BUF];
212 int count, retval = 0; 182 int count, retval = 0;
213 183
214 strcpy (local_name, name); /* strtok is destructive to name */ 184 assign (local_name, name); /* strtok is destructive to name */
215 185
216 for (cp = strtok (local_name, ","); cp; cp = strtok (NULL, ",")) 186 for (cp = strtok (local_name, ","); cp; cp = strtok (NULL, ","))
217 { 187 {
218 while (cp[0] == ' ') 188 while (cp[0] == ' ')
219 ++cp; /* get rid of spaces */ 189 ++cp; /* get rid of spaces */
… …
325 295
326/* init_blocksview();*/ 296/* init_blocksview();*/
327} 297}
328 298
329/* 299/*
330 * Stores debug-information about how efficient the hashtable
331 * used for archetypes has been in the static errmsg array.
332 */
333
334void
335arch_info (object *op)
336{
337 sprintf (errmsg, "%d searches and %d strcmp()'s", arch_search, arch_cmp);
338 new_draw_info (NDI_BLACK, 0, op, errmsg);
339}
340
341/*
342 * Initialise the hashtable used by the archetypes.
343 */
344
345void
346clear_archetable (void)
347{
348 memset ((void *) arch_table, 0, ARCHTABLE * sizeof (archetype *));
349}
350
351/*
352 * An alternative way to init the hashtable which is slower, but _works_... 300 * An alternative way to init the hashtable which is slower, but _works_...
353 */ 301 */
354
355void 302void
356init_archetable (void) 303init_archetable (void)
357{ 304{
358 archetype *at;
359
360 LOG (llevDebug, " Setting up archetable...\n"); 305 LOG (llevDebug, " Setting up archetable...\n");
361 306
362 for (at = first_archetype; at != NULL; at = (at->more == NULL) ? at->next : at->more) 307 for (archetype *at = first_archetype; at; at = at->next)
308 for (archetype *bt = at; bt; bt = bt->more)
363 at->hash_add (); 309 bt->hash_add ();
364 310
365 LOG (llevDebug, "done\n"); 311 LOG (llevDebug, "done\n");
366} 312}
367 313
368void 314void
369free_all_archs (void) 315free_all_archs (void)
370{ 316{
371 archetype *at, *next; 317 archetype *at, *next;
372 int i = 0, f = 0; 318 int i = 0, f = 0;
373 319
374 for (at = first_archetype; at != NULL; at = next) 320 for (at = first_archetype; at; at = next)
375 { 321 {
376 if (at->more) 322 if (at->more)
377 next = at->more; 323 next = at->more;
378 else 324 else
379 next = at->next; 325 next = at->next;
… …
387 LOG (llevDebug, "Freed %d archetypes, %d faces\n", i, f); 333 LOG (llevDebug, "Freed %d archetypes, %d faces\n", i, f);
388} 334}
389 335
390archetype::archetype () 336archetype::archetype ()
391{ 337{
392 clear_object (&clone); /* to initial state other also */ 338 clone.arch = this;
339
393 CLEAR_FLAG (&clone, FLAG_FREED); /* This shouldn't matter, since copy_to */ 340 CLEAR_FLAG (&clone, FLAG_FREED); /* This shouldn't matter, since copy_to */
394 SET_FLAG (&clone, FLAG_REMOVED); /* doesn't copy these flags... */ 341 SET_FLAG (&clone, FLAG_REMOVED); /* doesn't copy these flags... */
395} 342}
396 343
397archetype::~archetype () 344archetype::~archetype ()
398{ 345{
346 //TODO: nuke ->more's
347}
348
349archetype *
350archetype::read (object_thawer &f)
351{
352 assert (f.kw == KW_object);
353
354 archetype *head = new archetype;
355 f.get (head->name);
356
357 if (!head->clone.parse_kv (f))
358 {
359 delete head;
360 return 0;
361 }
362
363 for (archetype *prev = head; f.kw == KW_more; )
364 {
365 f.next ();
366
367 assert (f.kw == KW_object);
368
369 archetype *more = new archetype;
370 f.get (more->name);
371
372 if (!more->clone.parse_kv (f))
373 {
374 delete head;
375 return 0;
376 }
377
378 assert (("pippijn sagt es gibt keine tiles mehr", head->clone.face == more->clone.face));
379
380 if (more->clone.x > head->tail_x) head->tail_x = more->clone.x;
381 if (more->clone.y > head->tail_y) head->tail_y = more->clone.y;
382
383 more->head = head;
384 more->clone.head = &head->clone;
385 prev->more = more;
386 prev->clone.more = &more->clone;
387
388 prev = more;
389 }
390
391 head->next = first_archetype;
392 first_archetype = head;
393
394 return head;
399} 395}
400 396
401/* 397/*
402 * Reads/parses the archetype-file, and copies into a linked list 398 * Reads/parses the archetype-file, and copies into a linked list
403 * of archetype-structures. 399 * of archetype-structures.
404 */ 400 */
405void 401static bool
406first_arch_pass (object_thawer & fp) 402first_arch_pass (object_thawer &f)
407{ 403{
408 archetype *head = 0, *last_more = 0; 404 for (;;)
409
410 archetype *at = new archetype;
411 at->clone.arch = first_archetype = at;
412
413 while (int i = load_object (fp, &at->clone, 0))
414 { 405 {
415 at->clone.speed_left = (float) (-0.1);
416 /* copy the body_info to the body_used - this is only really
417 * need for monsters, but doesn't hurt to do it for everything.
418 * by doing so, when a monster is created, it has good starting
419 * values for the body_used info, so when items are created
420 * for it, they can be properly equipped.
421 */
422 memcpy (&at->clone.body_used, &at->clone.body_info, sizeof (at->clone.body_info));
423
424 switch (i) 406 switch (f.kw)
425 {
426 case LL_NORMAL: /* A new archetype, just link it with the previous */
427 if (last_more != NULL)
428 last_more->next = at;
429 if (head != NULL)
430 head->next = at;
431 head = last_more = at;
432#if 0
433 if (!op->type)
434 LOG (llevDebug, " WARNING: Archetype %s has no type info!\n", op->arch->name);
435#endif
436 at->tail_x = 0;
437 at->tail_y = 0;
438 break;
439
440 case LL_MORE: /* Another part of the previous archetype, link it correctly */
441
442 at->head = head;
443 at->clone.head = &head->clone;
444 if (last_more != NULL)
445 {
446 last_more->more = at;
447 last_more->clone.more = &at->clone;
448 }
449 last_more = at;
450
451 /* If this multipart image is still composed of individual small
452 * images, don't set the tail_.. values. We can't use them anyways,
453 * and setting these to zero makes the map sending to the client much
454 * easier as just looking at the head, we know what to do.
455 */
456 if (at->clone.face != head->clone.face)
457 {
458 head->tail_x = 0;
459 head->tail_y = 0;
460 }
461 else
462 {
463 if (at->clone.x > head->tail_x)
464 head->tail_x = at->clone.x;
465 if (at->clone.y > head->tail_y)
466 head->tail_y = at->clone.y;
467 }
468 break;
469
470 } 407 {
408 case KW_object:
409 if (!archetype::read (f))
410 return false;
411 continue;
471 412
472 at = new archetype; 413 case KW_EOF:
414 return true;
473 415
474 at->clone.arch = at; 416 default:
475 } 417 if (!f.parse_error ("archetypes file"))
418 return false;
419 }
476 420
477 delete at; 421 f.next ();
422 }
478} 423}
479 424
480/* 425/*
481 * Reads the archetype file once more, and links all pointers between 426 * Reads the archetype file once more, and links all pointers between
482 * archetypes. 427 * archetypes.
483 */ 428 */
484
485void 429void
486second_arch_pass (object_thawer & thawer) 430second_arch_pass (object_thawer & thawer)
487{ 431{
488 char buf[MAX_BUF], *variable = buf, *argument, *cp; 432 char buf[MAX_BUF], *variable = buf, *argument, *cp;
489 archetype *at = NULL, *other; 433 archetype *at = NULL, *other;
490 434
491 while (fgets (buf, MAX_BUF, thawer) != NULL) 435 while (fgets (buf, MAX_BUF, thawer) != NULL)
492 { 436 {
493 if (*buf == '#') 437 if (*buf == '#')
494 continue; 438 continue;
439
495 if ((argument = strchr (buf, ' ')) != NULL) 440 if ((argument = strchr (buf, ' ')) != NULL)
496 { 441 {
497 *argument = '\0', argument++; 442 *argument = '\0', argument++;
498 cp = argument + strlen (argument) - 1; 443 cp = argument + strlen (argument) - 1;
499 while (isspace (*cp)) 444 while (isspace (*cp))
500 { 445 {
501 *cp = '\0'; 446 *cp = '\0';
502 cp--; 447 cp--;
503 } 448 }
504 } 449 }
450
505 if (!strcmp ("Object", variable)) 451 if (!strcmp ("object", variable))
506 { 452 {
507 if ((at = archetype::find (argument)) == NULL) 453 if ((at = archetype::find (argument)) == NULL)
508 LOG (llevError, "Warning: failed to find arch %s\n", argument); 454 LOG (llevError, "Warning: failed to find arch %s\n", argument);
509 } 455 }
510 else if (!strcmp ("other_arch", variable)) 456 else if (!strcmp ("other_arch", variable))
… …
517 at->clone.other_arch = other; 463 at->clone.other_arch = other;
518 } 464 }
519 } 465 }
520 else if (!strcmp ("randomitems", variable)) 466 else if (!strcmp ("randomitems", variable))
521 { 467 {
522 if (at != NULL) 468 if (at)
523 { 469 {
524 treasurelist *tl = find_treasurelist (argument); 470 treasurelist *tl = find_treasurelist (argument);
525 471
526 if (tl == NULL) 472 if (tl == NULL)
527 LOG (llevError, "Failed to link treasure to arch (%s): %s\n", &at->name, argument); 473 LOG (llevError, "Failed to link treasure to arch (%s): %s\n", &at->name, argument);
… …
558 504
559 sprintf (filename, "%s/%s", settings.datadir, settings.archetypes); 505 sprintf (filename, "%s/%s", settings.datadir, settings.archetypes);
560 LOG (llevDebug, "Reading archetypes from %s:\n", filename); 506 LOG (llevDebug, "Reading archetypes from %s:\n", filename);
561 507
562 { 508 {
563 object_thawer
564 thawer (filename); 509 object_thawer f (filename);
565 510
566 clear_archetable (); 511 f.next ();
512
567 LOG (llevDebug, " arch-pass 1...\n"); 513 LOG (llevDebug, " arch-pass 1...\n");
568 first_arch_pass (thawer); 514 if (!first_arch_pass (f))
515 cleanup ("errors during first arch pass are fatal");
569 LOG (llevDebug, " done\n"); 516 LOG (llevDebug, " done\n");
570 } 517 }
571 518
572 init_archetable (); 519 init_archetable ();
573 warn_archetypes = 1; 520 warn_archetypes = 1;
574 521
575 { 522 {
576 object_thawer
577 thawer (filename); 523 object_thawer f (filename);
578 524
579 LOG (llevDebug, " loading treasure...\n"); 525 LOG (llevDebug, " loading treasure...\n");
580 load_treasures (); 526 load_treasures ();
527 LOG (llevDebug, " done\n");
581 LOG (llevDebug, " done\n arch-pass 2...\n"); 528 LOG (llevDebug, " arch-pass 2...\n");
582 second_arch_pass (thawer); 529 second_arch_pass (f);
583 LOG (llevDebug, " done\n"); 530 LOG (llevDebug, " done\n");
584#ifdef DEBUG 531#ifdef DEBUG
585 check_generators (); 532 check_generators ();
586#endif 533#endif
587 } 534 }
… …
590 537
591/* 538/*
592 * Creates and returns a new object which is a copy of the given archetype. 539 * Creates and returns a new object which is a copy of the given archetype.
593 * This function returns NULL on failure. 540 * This function returns NULL on failure.
594 */ 541 */
595
596object * 542object *
597arch_to_object (archetype *at) 543arch_to_object (archetype *at)
598{ 544{
599 object *op; 545 if (!at)
600
601 if (at == NULL)
602 { 546 {
603 if (warn_archetypes) 547 if (warn_archetypes)
604 LOG (llevError, "Couldn't find archetype.\n"); 548 LOG (llevError, "Couldn't find archetype.\n");
605 549
606 return NULL; 550 return NULL;
607 } 551 }
608 552
609 op = object::create (); 553 object *op = at->clone.clone ();
610 at->clone.copy_to (op);
611 op->arch = at; 554 op->arch = at;
612 op->instantiate (); 555 op->instantiate ();
613 return op; 556 return op;
614} 557}
615 558
… …
617 * Creates an object. This function is called by get_archetype() 560 * Creates an object. This function is called by get_archetype()
618 * if it fails to find the appropriate archetype. 561 * if it fails to find the appropriate archetype.
619 * Thus get_archetype() will be guaranteed to always return 562 * Thus get_archetype() will be guaranteed to always return
620 * an object, and never NULL. 563 * an object, and never NULL.
621 */ 564 */
622
623object * 565object *
624create_singularity (const char *name) 566create_singularity (const char *name)
625{ 567{
626 object *op; 568 object *op;
627 char buf[MAX_BUF]; 569 char buf[MAX_BUF];
… …
635 577
636/* 578/*
637 * Finds which archetype matches the given name, and returns a new 579 * Finds which archetype matches the given name, and returns a new
638 * object containing a copy of the archetype. 580 * object containing a copy of the archetype.
639 */ 581 */
640
641object * 582object *
642get_archetype (const char *name) 583get_archetype (const char *name)
643{ 584{
644 archetype *at = archetype::find (name); 585 archetype *at = archetype::find (name);
645 586
… …
681 622
682/* 623/*
683 * Finds, using the hashtable, which archetype matches the given name. 624 * Finds, using the hashtable, which archetype matches the given name.
684 * returns a pointer to the found archetype, otherwise NULL. 625 * returns a pointer to the found archetype, otherwise NULL.
685 */ 626 */
686
687archetype * 627archetype *
688archetype::find (const char *name) 628archetype::find (const char *name)
689{ 629{
690 if (!name) 630 if (!name)
691 return 0; 631 return 0;
692 632
693#if USE_UNORDERED_MAP
694 AUTODECL (i, ht.find ((size_t) name)); 633 AUTODECL (i, ht.find (name));
695 634
696 if (i == ht.end ()) 635 if (i == ht.end ())
697 return 0; 636 return 0;
698 else 637 else
699 return i->second; 638 return i->second;
700#endif
701
702 archetype *at;
703 unsigned long index;
704
705 index = hasharch (name, ARCHTABLE);
706 arch_search++;
707 for (;;)
708 {
709 at = arch_table[index];
710
711 if (at == NULL)
712 {
713 if (warn_archetypes)
714 LOG (llevError, "Couldn't find archetype %s\n", name);
715
716 return NULL;
717 }
718
719 arch_cmp++;
720
721 if (!strcmp ((const char *) at->name, name))
722 return at;
723
724 if (++index >= ARCHTABLE)
725 index = 0;
726 }
727} 639}
728 640
729/* 641/*
730 * Adds an archetype to the hashtable. 642 * Adds an archetype to the hashtable.
731 */ 643 */
732void 644void
733archetype::hash_add () 645archetype::hash_add ()
734{ 646{
735#if USE_UNORDERED_MAP
736 ht.insert (std::make_pair ((size_t) (const char *) name, this)); 647 ht.insert (std::make_pair (name, this));
737#else
738
739 int index = hasharch ((const char *) name, ARCHTABLE), org_index = index;
740
741 for (;;)
742 {
743 if (!arch_table[index])
744 {
745 arch_table[index] = this;
746 break;
747 }
748
749 if (++index == ARCHTABLE)
750 index = 0;
751
752 if (index == org_index)
753 fatal (ARCHTABLE_TOO_SMALL);
754 }
755#endif
756} 648}
757 649
758void 650void
759archetype::hash_del () 651archetype::hash_del ()
760{ 652{
761#if USE_UNORDERED_MAP 653 ht.erase (name);
762# error remove this from HT
763#else
764
765 int index = hasharch ((const char *) name, ARCHTABLE), org_index = index;
766
767 for (;;)
768 {
769 if (arch_table[index] == this)
770 {
771 arch_table[index] = 0;
772 break;
773 }
774
775 if (++index == ARCHTABLE)
776 index = 0;
777
778 if (index == org_index)
779 break;
780 }
781#endif
782} 654}
783 655
784/* 656/*
785 * Returns the first archetype using the given type. 657 * Returns the first archetype using the given type.
786 * Used in treasure-generation. 658 * Used in treasure-generation.
787 */ 659 */
788
789archetype * 660archetype *
790type_to_archetype (int type) 661type_to_archetype (int type)
791{ 662{
792 archetype *at; 663 archetype *at;
793 664
… …
806 677
807object * 678object *
808clone_arch (int type) 679clone_arch (int type)
809{ 680{
810 archetype *at; 681 archetype *at;
811 object *op = object::create ();
812 682
813 if ((at = type_to_archetype (type)) == NULL) 683 if ((at = type_to_archetype (type)) == NULL)
814 { 684 {
815 LOG (llevError, "Can't clone archetype %d\n", type); 685 LOG (llevError, "Can't clone archetype %d\n", type);
816 op->destroy ();
817 return NULL; 686 return 0;
818 } 687 }
819 688
820 at->clone.copy_to (op); 689 object *op = at->clone.clone ();
821 op->instantiate (); 690 op->instantiate ();
822 return op; 691 return op;
823} 692}
824 693
825/* 694/*

Diff Legend

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