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.15 by root, Sun Sep 10 13:20:12 2006 UTC vs.
Revision 1.38 by root, Fri Feb 2 21:50:43 2007 UTC

1
2/* 1/*
3 * static char *rcsid_arch_c =
4 * "$Id: arch.C,v 1.15 2006/09/10 13:20:12 root Exp $";
5 */
6
7/*
8 CrossFire, A Multiplayer game for X-windows 2 * CrossFire, A Multiplayer game for X-windows
9 3 *
4 * Copyright (C) 2005, 2006, 2007 Marc Lehmann & Crossfire+ Development Team
10 Copyright (C) 2002 Mark Wedel & Crossfire Development Team 5 * Copyright (C) 2002 Mark Wedel & Crossfire Development Team
11 Copyright (C) 1992 Frank Tore Johansen 6 * Copyright (C) 1992 Frank Tore Johansen
12 7 *
13 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
14 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
15 the Free Software Foundation; either version 2 of the License, or 10 * the Free Software Foundation; either version 2 of the License, or
16 (at your option) any later version. 11 * (at your option) any later version.
17 12 *
18 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,
19 but WITHOUT ANY WARRANTY; without even the implied warranty of 14 * but WITHOUT ANY WARRANTY; without even the implied warranty of
20 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the 15 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
21 GNU General Public License for more details. 16 * GNU General Public License for more details.
22 17 *
23 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
24 along with this program; if not, write to the Free Software 19 * along with this program; if not, write to the Free Software
25 Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. 20 * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
26 21 *
27 The authors can be reached via e-mail at crossfire-devel@real-time.com 22 * The authors can be reached via e-mail at <crossfire@schmorp.de>
28*/ 23 */
29 24
30#include <cassert> 25#include <cassert>
31 26
32#include <tr1/unordered_map>
33
34#include <global.h> 27#include <global.h>
35#include <arch.h>
36#include <funcpoint.h> 28#include <funcpoint.h>
37#include <loader.h> 29#include <loader.h>
38 30
39/* IF set, does a little timing on the archetype load. */ 31#include <tr1/functional>
40#define TIME_ARCH_LOAD 0 32#include <tr1/unordered_map>
41 33
42static void add_arch (archetype *at);
43
44static archetype *arch_table[ARCHTABLE];
45int arch_cmp = 0; /* How many strcmp's */
46int arch_search = 0; /* How many searches */
47int arch_init; /* True if doing arch initialization */ 34int arch_init; /* True if doing arch initialization */
48 35
49/* The naming of these functions is really poor - they are all 36/* The naming of these functions is really poor - they are all
50 * pretty much named '.._arch_...', but they may more may not 37 * pretty much named '.._arch_...', but they may more may not
51 * return archetypes. Some make the arch_to_object call, and thus 38 * return archetypes. Some make the arch_to_object call, and thus
52 * return an object. Perhaps those should be called 'archob' functions 39 * return an object. Perhaps those should be called 'archob' functions
53 * to denote they return an object derived from the archetype. 40 * to denote they return an object derived from the archetype.
54 * MSW 2003-04-29 41 * MSW 2003-04-29
55 */ 42 */
56 43
57#if USE_UNORDERED_MAP
58// the hashtable 44// the hashtable
59typedef
60 std::tr1::unordered_map < 45typedef std::tr1::unordered_map
61size_t, archetype *> 46 <
47 const char *,
48 arch_ptr,
49 str_hash,
50 str_equal,
51 slice_allocator< std::pair<const char *const, arch_ptr> >
62 HT; 52 > HT;
63 53
64static HT 54static HT ht (5000);
65 ht;
66#endif
67 55
68/** 56/**
69 * GROS - This function retrieves an archetype given the name that appears 57 * GROS - This function retrieves an archetype given the name that appears
70 * during the game (for example, "writing pen" instead of "stylus"). 58 * during the game (for example, "writing pen" instead of "stylus").
71 * 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.
… …
77 * - the archetype found or null if nothing was found. 65 * - the archetype found or null if nothing was found.
78 */ 66 */
79archetype * 67archetype *
80find_archetype_by_object_name (const char *name) 68find_archetype_by_object_name (const char *name)
81{ 69{
82 archetype * 70 archetype *at;
83 at;
84 71
85 if (name == NULL) 72 if (name == NULL)
86 return (archetype *) NULL; 73 return (archetype *) NULL;
87 74
88 for (at = first_archetype; at != NULL; at = at->next) 75 for (at = first_archetype; at != NULL; at = at->next)
… …
99 * except that it considers only items of the given type. 86 * except that it considers only items of the given type.
100 */ 87 */
101archetype * 88archetype *
102find_archetype_by_object_type_name (int type, const char *name) 89find_archetype_by_object_type_name (int type, const char *name)
103{ 90{
104 archetype * 91 archetype *at;
105 at;
106 92
107 if (name == NULL) 93 if (name == NULL)
108 return NULL; 94 return NULL;
109 95
110 for (at = first_archetype; at != NULL; at = at->next) 96 for (at = first_archetype; at != NULL; at = at->next)
… …
122 * If type is -1, ew don't match on type. 108 * If type is -1, ew don't match on type.
123 */ 109 */
124object * 110object *
125get_archetype_by_skill_name (const char *skill, int type) 111get_archetype_by_skill_name (const char *skill, int type)
126{ 112{
127 archetype * 113 archetype *at;
128 at;
129 114
130 if (skill == NULL) 115 if (skill)
131 return NULL;
132
133 for (at = first_archetype; at != NULL; at = at->next) 116 for (at = first_archetype; at; at = at->next)
134 {
135 if (((type == -1) || (type == at->clone.type)) && (!strcmp (at->clone.skill, skill))) 117 if (((type == -1) || (type == at->clone.type)) && (!strcmp (at->clone.skill, skill)))
136 return arch_to_object (at); 118 return arch_to_object (at);
137 } 119
138 return NULL; 120 return 0;
139} 121}
140 122
141/* similiar to above - this returns the first archetype 123/* similiar to above - this returns the first archetype
142 * that matches both the type and subtype. type and subtype 124 * that matches both the type and subtype. type and subtype
143 * can be -1 to say ignore, but in this case, the match it does 125 * can be -1 to say ignore, but in this case, the match it does
… …
172 * but it otherwise had a big memory leak. 154 * but it otherwise had a big memory leak.
173 */ 155 */
174object * 156object *
175get_archetype_by_object_name (const char *name) 157get_archetype_by_object_name (const char *name)
176{ 158{
177 archetype * 159 archetype *at;
178 at;
179 char
180 tmpname[MAX_BUF]; 160 char tmpname[MAX_BUF];
181 int 161 int i;
182 i;
183 162
184 strncpy (tmpname, name, MAX_BUF - 1); 163 assign (tmpname, name);
185 tmpname[MAX_BUF - 1] = 0; 164
186 for (i = strlen (tmpname); i > 0; i--) 165 for (i = strlen (tmpname); i > 0; i--)
187 { 166 {
188 tmpname[i] = 0; 167 tmpname[i] = 0;
189 at = find_archetype_by_object_name (tmpname); 168 at = find_archetype_by_object_name (tmpname);
169
190 if (at != NULL) 170 if (at)
191 {
192 return arch_to_object (at); 171 return arch_to_object (at);
193 }
194 } 172 }
173
195 return create_singularity (name); 174 return create_singularity (name);
196} 175}
197 176
198 /* This is a subset of the parse_id command. Basically, name can be 177 /* This is a subset of the parse_id command. Basically, name can be
199 * a string seperated lists of things to match, with certain keywords. 178 * a string seperated lists of things to match, with certain keywords.
… …
213 * Last, make a check on the full name. 192 * Last, make a check on the full name.
214 */ 193 */
215int 194int
216item_matched_string (object *pl, object *op, const char *name) 195item_matched_string (object *pl, object *op, const char *name)
217{ 196{
218 char *
219 cp,
220 local_name[MAX_BUF]; 197 char *cp, local_name[MAX_BUF];
221 int 198 int count, retval = 0;
222 count,
223 retval = 0;
224 199
225 strcpy (local_name, name); /* strtok is destructive to name */ 200 strcpy (local_name, name); /* strtok is destructive to name */
226 201
227 for (cp = strtok (local_name, ","); cp; cp = strtok (NULL, ",")) 202 for (cp = strtok (local_name, ","); cp; cp = strtok (NULL, ","))
228 { 203 {
… …
280 retval = 15; 255 retval = 15;
281 else if (!strncasecmp (cp, query_base_name (op, 0), strlen (cp))) 256 else if (!strncasecmp (cp, query_base_name (op, 0), strlen (cp)))
282 retval = 14; 257 retval = 14;
283 else if (!strncasecmp (cp, query_base_name (op, 1), strlen (cp))) 258 else if (!strncasecmp (cp, query_base_name (op, 1), strlen (cp)))
284 retval = 14; 259 retval = 14;
285
286 /* Do substring checks, so things like 'Str+1' will match. 260 /* Do substring checks, so things like 'Str+1' will match.
287 * retval of these should perhaps be lower - they are lower 261 * retval of these should perhaps be lower - they are lower
288 * then the specific strcasecmp aboves, but still higher than 262 * then the specific strcasecmp aboves, but still higher than
289 * some other match criteria. 263 * some other match criteria.
290 */ 264 */
… …
292 retval = 12; 266 retval = 12;
293 else if (strstr (query_base_name (op, 0), cp)) 267 else if (strstr (query_base_name (op, 0), cp))
294 retval = 12; 268 retval = 12;
295 else if (strstr (query_short_name (op), cp)) 269 else if (strstr (query_short_name (op), cp))
296 retval = 12; 270 retval = 12;
297
298 /* Check against plural/non plural based on count. */ 271 /* Check against plural/non plural based on count. */
299 else if (count > 1 && !strcasecmp (cp, op->name_pl)) 272 else if (count > 1 && !strcasecmp (cp, op->name_pl))
300 {
301 retval = 6; 273 retval = 6;
302 }
303 else if (count == 1 && !strcasecmp (op->name, cp)) 274 else if (count == 1 && !strcasecmp (op->name, cp))
304 {
305 retval = 6; 275 retval = 6;
306 }
307 /* base name matched - not bad */ 276 /* base name matched - not bad */
308 else if (strcasecmp (cp, op->name) == 0 && !count) 277 else if (strcasecmp (cp, op->name) == 0 && !count)
309 retval = 4; 278 retval = 4;
310 /* Check for partial custom name, but give a real low priority */ 279 /* Check for partial custom name, but give a real low priority */
311 else if (op->custom_name && strstr (op->custom_name, cp)) 280 else if (op->custom_name && strstr (op->custom_name, cp))
… …
313 282
314 if (retval) 283 if (retval)
315 { 284 {
316 if (pl->type == PLAYER) 285 if (pl->type == PLAYER)
317 pl->contr->count = count; 286 pl->contr->count = count;
287
318 return retval; 288 return retval;
319 } 289 }
320 } 290 }
291
321 return 0; 292 return 0;
322} 293}
323 294
324/* 295/*
325 * Initialises the internal linked list of archetypes (read from file). 296 * Initialises the internal linked list of archetypes (read from file).
… …
330void 301void
331init_archetypes (void) 302init_archetypes (void)
332{ /* called from add_player() and edit() */ 303{ /* called from add_player() and edit() */
333 if (first_archetype != NULL) /* Only do this once */ 304 if (first_archetype != NULL) /* Only do this once */
334 return; 305 return;
306
335 arch_init = 1; 307 arch_init = 1;
336 load_archetypes (); 308 load_archetypes ();
337 arch_init = 0; 309 arch_init = 0;
338 empty_archetype = find_archetype ("empty_archetype"); 310 empty_archetype = archetype::find ("empty_archetype");
339 311
340/* init_blocksview();*/ 312/* init_blocksview();*/
341} 313}
342 314
343/* 315/*
344 * Stores debug-information about how efficient the hashtable
345 * used for archetypes has been in the static errmsg array.
346 */
347
348void
349arch_info (object *op)
350{
351 sprintf (errmsg, "%d searches and %d strcmp()'s", arch_search, arch_cmp);
352 new_draw_info (NDI_BLACK, 0, op, errmsg);
353}
354
355/*
356 * Initialise the hashtable used by the archetypes.
357 */
358
359void
360clear_archetable (void)
361{
362 memset ((void *) arch_table, 0, ARCHTABLE * sizeof (archetype *));
363}
364
365/*
366 * An alternative way to init the hashtable which is slower, but _works_... 316 * An alternative way to init the hashtable which is slower, but _works_...
367 */ 317 */
368
369void 318void
370init_archetable (void) 319init_archetable (void)
371{ 320{
372 archetype * 321 archetype *at;
373 at;
374 322
375 LOG (llevDebug, " Setting up archetable...\n"); 323 LOG (llevDebug, " Setting up archetable...\n");
376 324
377 for (at = first_archetype; at != NULL; at = (at->more == NULL) ? at->next : at->more) 325 for (at = first_archetype; at; at = at->more ? at->more : at->next)
378 add_arch (at); 326 at->hash_add ();
379 327
380 LOG (llevDebug, "done\n"); 328 LOG (llevDebug, "done\n");
381} 329}
382 330
383/*
384 * Dumps an archetype to debug-level output.
385 */
386
387void
388dump_arch (archetype *at)
389{
390 dump_object (&at->clone);
391}
392
393/*
394 * Dumps _all_ archetypes to debug-level output.
395 * If you run crossfire with debug, and enter DM-mode, you can trigger
396 * this with the O key.
397 */
398
399void
400dump_all_archetypes (void)
401{
402 archetype *
403 at;
404
405 for (at = first_archetype; at != NULL; at = (at->more == NULL) ? at->next : at->more)
406 {
407 dump_arch (at);
408 fprintf (logfile, "%s\n", errmsg);
409 }
410}
411
412void 331void
413free_all_archs (void) 332free_all_archs (void)
414{ 333{
415 archetype * 334 archetype *at, *next;
416 at, *
417 next;
418 int
419 i = 0, f = 0; 335 int i = 0, f = 0;
420 336
421 for (at = first_archetype; at != NULL; at = next) 337 for (at = first_archetype; at; at = next)
422 { 338 {
423 if (at->more) 339 if (at->more)
424 next = at->more; 340 next = at->more;
425 else 341 else
426 next = at->next; 342 next = at->next;
427 343
428 delete at; 344 delete
345 at;
346
429 i++; 347 i++;
430 } 348 }
349
431 LOG (llevDebug, "Freed %d archetypes, %d faces\n", i, f); 350 LOG (llevDebug, "Freed %d archetypes, %d faces\n", i, f);
432} 351}
433 352
434archetype::archetype () 353archetype::archetype ()
435{ 354{
436 clear_object (&clone); /* to initial state other also */
437 CLEAR_FLAG (&clone, FLAG_FREED); /* This shouldn't matter, since copy_object() */ 355 CLEAR_FLAG (&clone, FLAG_FREED); /* This shouldn't matter, since copy_to */
438 SET_FLAG (&clone, FLAG_REMOVED); /* doesn't copy these flags... */ 356 SET_FLAG (&clone, FLAG_REMOVED); /* doesn't copy these flags... */
439} 357}
440 358
441archetype::~archetype () 359archetype::~archetype ()
442{ 360{
… …
447 * of archetype-structures. 365 * of archetype-structures.
448 */ 366 */
449void 367void
450first_arch_pass (object_thawer & fp) 368first_arch_pass (object_thawer & fp)
451{ 369{
452 archetype * 370 archetype *head = 0, *last_more = 0;
453 at, *
454 head = NULL, *last_more = NULL;
455 371
372 archetype *at = new archetype;
456 at->clone.arch = first_archetype = at = new archetype; 373 at->clone.arch = first_archetype = at;
457 374
458 while (int i = load_object (fp, &at->clone, 0)) 375 while (int i = load_object (fp, &at->clone, 0))
459 { 376 {
460 at->clone.speed_left = (float) (-0.1); 377 at->clone.speed_left = (float) (-0.1);
461 /* copy the body_info to the body_used - this is only really 378 /* copy the body_info to the body_used - this is only really
… …
517 at = new archetype; 434 at = new archetype;
518 435
519 at->clone.arch = at; 436 at->clone.arch = at;
520 } 437 }
521 438
522 delete 439 delete at;
523 at;
524} 440}
525 441
526/* 442/*
527 * Reads the archetype file once more, and links all pointers between 443 * Reads the archetype file once more, and links all pointers between
528 * archetypes. 444 * archetypes.
529 */ 445 */
530 446
531void 447void
532second_arch_pass (object_thawer & thawer) 448second_arch_pass (object_thawer & thawer)
533{ 449{
534 char
535 buf[MAX_BUF], *
536 variable = buf, *argument, *cp; 450 char buf[MAX_BUF], *variable = buf, *argument, *cp;
537 archetype *
538 at = NULL, *other; 451 archetype *at = NULL, *other;
539 452
540 while (fgets (buf, MAX_BUF, thawer) != NULL) 453 while (fgets (buf, MAX_BUF, thawer) != NULL)
541 { 454 {
542 if (*buf == '#') 455 if (*buf == '#')
543 continue; 456 continue;
… …
551 cp--; 464 cp--;
552 } 465 }
553 } 466 }
554 if (!strcmp ("Object", variable)) 467 if (!strcmp ("Object", variable))
555 { 468 {
556 if ((at = find_archetype (argument)) == NULL) 469 if ((at = archetype::find (argument)) == NULL)
557 LOG (llevError, "Warning: failed to find arch %s\n", argument); 470 LOG (llevError, "Warning: failed to find arch %s\n", argument);
558 } 471 }
559 else if (!strcmp ("other_arch", variable)) 472 else if (!strcmp ("other_arch", variable))
560 { 473 {
561 if (at != NULL && at->clone.other_arch == NULL) 474 if (at != NULL && at->clone.other_arch == NULL)
562 { 475 {
563 if ((other = find_archetype (argument)) == NULL) 476 if ((other = archetype::find (argument)) == NULL)
564 LOG (llevError, "Warning: failed to find other_arch %s\n", argument); 477 LOG (llevError, "Warning: failed to find other_arch %s\n", argument);
565 else if (at != NULL) 478 else if (at != NULL)
566 at->clone.other_arch = other; 479 at->clone.other_arch = other;
567 } 480 }
568 } 481 }
569 else if (!strcmp ("randomitems", variable)) 482 else if (!strcmp ("randomitems", variable))
570 { 483 {
571 if (at != NULL) 484 if (at != NULL)
572 { 485 {
573 treasurelist *
574 tl = find_treasurelist (argument); 486 treasurelist *tl = find_treasurelist (argument);
575 487
576 if (tl == NULL) 488 if (tl == NULL)
577 LOG (llevError, "Failed to link treasure to arch (%s): %s\n", &at->name, argument); 489 LOG (llevError, "Failed to link treasure to arch (%s): %s\n", &at->name, argument);
578 else 490 else
579 at->clone.randomitems = tl; 491 at->clone.randomitems = tl;
… …
584 496
585#ifdef DEBUG 497#ifdef DEBUG
586void 498void
587check_generators (void) 499check_generators (void)
588{ 500{
589 archetype * 501 archetype *at;
590 at;
591 502
592 for (at = first_archetype; at != NULL; at = at->next) 503 for (at = first_archetype; at != NULL; at = at->next)
593 if (QUERY_FLAG (&at->clone, FLAG_GENERATOR) && at->clone.other_arch == NULL) 504 if (QUERY_FLAG (&at->clone, FLAG_GENERATOR) && at->clone.other_arch == NULL)
594 LOG (llevError, "Warning: %s is generator but lacks other_arch.\n", &at->name); 505 LOG (llevError, "Warning: %s is generator but lacks other_arch.\n", &at->name);
595} 506}
… …
603 */ 514 */
604 515
605void 516void
606load_archetypes (void) 517load_archetypes (void)
607{ 518{
608 char
609 filename[MAX_BUF]; 519 char filename[MAX_BUF];
610
611#if TIME_ARCH_LOAD
612 struct timeval
613 tv1,
614 tv2;
615#endif
616 520
617 sprintf (filename, "%s/%s", settings.datadir, settings.archetypes); 521 sprintf (filename, "%s/%s", settings.datadir, settings.archetypes);
618 LOG (llevDebug, "Reading archetypes from %s:\n", filename); 522 LOG (llevDebug, "Reading archetypes from %s:\n", filename);
619 523
620 { 524 {
525 object_thawer
621 object_thawer thawer (filename); 526 thawer (filename);
622 527
623 clear_archetable ();
624 LOG (llevDebug, " arch-pass 1...\n"); 528 LOG (llevDebug, " arch-pass 1...\n");
625 first_arch_pass (thawer); 529 first_arch_pass (thawer);
626 LOG (llevDebug, " done\n"); 530 LOG (llevDebug, " done\n");
627 } 531 }
628 532
629 init_archetable (); 533 init_archetable ();
630 warn_archetypes = 1; 534 warn_archetypes = 1;
631 535
632 { 536 {
537 object_thawer
633 object_thawer thawer (filename); 538 thawer (filename);
634 539
635 LOG (llevDebug, " loading treasure...\n"); 540 LOG (llevDebug, " loading treasure...\n");
636 load_treasures (); 541 load_treasures ();
542 LOG (llevDebug, " done\n");
637 LOG (llevDebug, " done\n arch-pass 2...\n"); 543 LOG (llevDebug, " arch-pass 2...\n");
638 second_arch_pass (thawer); 544 second_arch_pass (thawer);
639 LOG (llevDebug, " done\n"); 545 LOG (llevDebug, " done\n");
640#ifdef DEBUG 546#ifdef DEBUG
641 check_generators (); 547 check_generators ();
642#endif 548#endif
… …
646 552
647/* 553/*
648 * Creates and returns a new object which is a copy of the given archetype. 554 * Creates and returns a new object which is a copy of the given archetype.
649 * This function returns NULL on failure. 555 * This function returns NULL on failure.
650 */ 556 */
651
652object * 557object *
653arch_to_object (archetype *at) 558arch_to_object (archetype *at)
654{ 559{
655 object * 560 object *op;
656 op;
657 561
658 if (at == NULL) 562 if (at == NULL)
659 { 563 {
660 if (warn_archetypes) 564 if (warn_archetypes)
661 LOG (llevError, "Couldn't find archetype.\n"); 565 LOG (llevError, "Couldn't find archetype.\n");
662 566
663 return NULL; 567 return NULL;
664 } 568 }
665 569
666 op = get_object (); 570 op = at->clone.clone ();
667 copy_object (&at->clone, op);
668 op->arch = at; 571 op->arch = at;
669 op->instantiate (); 572 op->instantiate ();
670 return op; 573 return op;
671} 574}
672 575
… …
674 * Creates an object. This function is called by get_archetype() 577 * Creates an object. This function is called by get_archetype()
675 * if it fails to find the appropriate archetype. 578 * if it fails to find the appropriate archetype.
676 * Thus get_archetype() will be guaranteed to always return 579 * Thus get_archetype() will be guaranteed to always return
677 * an object, and never NULL. 580 * an object, and never NULL.
678 */ 581 */
679
680object * 582object *
681create_singularity (const char *name) 583create_singularity (const char *name)
682{ 584{
683 object * 585 object *op;
684 op;
685 char
686 buf[MAX_BUF]; 586 char buf[MAX_BUF];
687 587
688 sprintf (buf, "%s (%s)", ARCH_SINGULARITY, name); 588 sprintf (buf, "%s (%s)", ARCH_SINGULARITY, name);
689 op = get_object (); 589 op = object::create ();
690 op->name = op->name_pl = buf; 590 op->name = op->name_pl = buf;
691 SET_FLAG (op, FLAG_NO_PICK); 591 SET_FLAG (op, FLAG_NO_PICK);
692 return op; 592 return op;
693} 593}
694 594
695/* 595/*
696 * Finds which archetype matches the given name, and returns a new 596 * Finds which archetype matches the given name, and returns a new
697 * object containing a copy of the archetype. 597 * object containing a copy of the archetype.
698 */ 598 */
699
700object * 599object *
701get_archetype (const char *name) 600get_archetype (const char *name)
702{ 601{
703 archetype * 602 archetype *at = archetype::find (name);
704 at;
705 603
706 at = find_archetype (name); 604 if (!at)
707 if (at == NULL)
708 return create_singularity (name); 605 return create_singularity (name);
709 606
710 return arch_to_object (at); 607 return arch_to_object (at);
711} 608}
712 609
… …
715 */ 612 */
716 613
717unsigned long 614unsigned long
718hasharch (const char *str, int tablesize) 615hasharch (const char *str, int tablesize)
719{ 616{
720 unsigned long 617 unsigned long hash = 0;
721 hash = 0;
722 unsigned int 618 unsigned int i = 0;
723 i = 0;
724 const char * 619 const char *p;
725 p;
726 620
727 /* use the one-at-a-time hash function, which supposedly is 621 /* use the one-at-a-time hash function, which supposedly is
728 * better than the djb2-like one used by perl5.005, but 622 * better than the djb2-like one used by perl5.005, but
729 * certainly is better then the bug used here before. 623 * certainly is better then the bug used here before.
730 * see http://burtleburtle.net/bob/hash/doobs.html 624 * see http://burtleburtle.net/bob/hash/doobs.html
… …
745 639
746/* 640/*
747 * Finds, using the hashtable, which archetype matches the given name. 641 * Finds, using the hashtable, which archetype matches the given name.
748 * returns a pointer to the found archetype, otherwise NULL. 642 * returns a pointer to the found archetype, otherwise NULL.
749 */ 643 */
750
751archetype * 644archetype *
752find_archetype (const char *name) 645archetype::find (const char *name)
753{ 646{
754#if USE_UNORDERED_MAP
755 name = shstr::find (name);
756
757 if (!name) 647 if (!name)
758 return 0; 648 return 0;
759 649
760 HT::const_iterator i = ht.find ((size_t) name); 650 AUTODECL (i, ht.find (name));
761 651
762 if (i == ht.end ()) 652 if (i == ht.end ())
763 return 0; 653 return 0;
764 else 654 else
765 return i->second; 655 return i->second;
766#endif
767
768 archetype *
769 at;
770 unsigned long
771 index;
772
773 if (name == NULL)
774 return (archetype *) NULL;
775
776 index = hasharch (name, ARCHTABLE);
777 arch_search++;
778 for (;;)
779 {
780 at = arch_table[index];
781 if (at == NULL)
782 {
783 if (warn_archetypes)
784 LOG (llevError, "Couldn't find archetype %s\n", name);
785 return NULL;
786 }
787 arch_cmp++;
788 if (!strcmp ((const char *) at->name, name))
789 return at;
790 if (++index >= ARCHTABLE)
791 index = 0;
792 }
793} 656}
794 657
795/* 658/*
796 * Adds an archetype to the hashtable. 659 * Adds an archetype to the hashtable.
797 */ 660 */
798 661void
799static void 662archetype::hash_add ()
800add_arch (archetype *at)
801{ 663{
802#if USE_UNORDERED_MAP 664 ht.insert (std::make_pair (name, this));
803 ht.insert (std::make_pair ((size_t) (const char *) at->name, at)); 665}
804#endif
805 666
806 int 667void
807 index = hasharch ((const char *) at->name, ARCHTABLE), org_index = index; 668archetype::hash_del ()
808 669{
809 for (;;) 670 ht.erase (name);
810 {
811 if (arch_table[index] == NULL)
812 {
813 arch_table[index] = at;
814 return;
815 }
816
817 if (++index == ARCHTABLE)
818 index = 0;
819
820 if (index == org_index)
821 fatal (ARCHTABLE_TOO_SMALL);
822 }
823} 671}
824 672
825/* 673/*
826 * Returns the first archetype using the given type. 674 * Returns the first archetype using the given type.
827 * Used in treasure-generation. 675 * Used in treasure-generation.
828 */ 676 */
829
830archetype * 677archetype *
831type_to_archetype (int type) 678type_to_archetype (int type)
832{ 679{
833 archetype * 680 archetype *at;
834 at;
835 681
836 for (at = first_archetype; at != NULL; at = (at->more == NULL) ? at->next : at->more) 682 for (at = first_archetype; at; at = at->more == 0 ? at->next : at->more)
837 if (at->clone.type == type) 683 if (at->clone.type == type)
838 return at; 684 return at;
685
839 return NULL; 686 return 0;
840} 687}
841 688
842/* 689/*
843 * Returns a new object copied from the first archetype matching 690 * Returns a new object copied from the first archetype matching
844 * the given type. 691 * the given type.
… …
846 */ 693 */
847 694
848object * 695object *
849clone_arch (int type) 696clone_arch (int type)
850{ 697{
851 archetype * 698 archetype *at;
852 at;
853 object *
854 op = get_object ();
855 699
856 if ((at = type_to_archetype (type)) == NULL) 700 if ((at = type_to_archetype (type)) == NULL)
857 { 701 {
858 LOG (llevError, "Can't clone archetype %d\n", type); 702 LOG (llevError, "Can't clone archetype %d\n", type);
859 free_object (op);
860 return NULL; 703 return 0;
861 } 704 }
862 copy_object (&at->clone, op); 705
706 object *op = at->clone.clone ();
863 op->instantiate (); 707 op->instantiate ();
864 return op; 708 return op;
865} 709}
866 710
867/* 711/*
… …
869 */ 713 */
870 714
871object * 715object *
872object_create_arch (archetype *at) 716object_create_arch (archetype *at)
873{ 717{
874 object * 718 object *op, *prev = 0, *head = 0;
875 op, *
876 prev = NULL, *head = NULL;
877 719
878 while (at) 720 while (at)
879 { 721 {
880 op = arch_to_object (at); 722 op = arch_to_object (at);
881 op->x = at->clone.x; 723 op->x = at->clone.x;
882 op->y = at->clone.y; 724 op->y = at->clone.y;
725
883 if (head) 726 if (head)
884 op->head = head, prev->more = op; 727 op->head = head, prev->more = op;
728
885 if (!head) 729 if (!head)
886 head = op; 730 head = op;
731
887 prev = op; 732 prev = op;
888 at = at->more; 733 at = at->more;
889 } 734 }
735
890 return (head); 736 return (head);
891} 737}
892 738
893/*** end of arch.c ***/

Diff Legend

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