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.26 by root, Fri Nov 17 19:40:53 2006 UTC

1
2/*
3 * static char *rcsid_arch_c =
4 * "$Id: arch.C,v 1.15 2006/09/10 13:20:12 root Exp $";
5 */
6
7/* 1/*
8 CrossFire, A Multiplayer game for X-windows 2 CrossFire, A Multiplayer game for X-windows
9 3
10 Copyright (C) 2002 Mark Wedel & Crossfire Development Team 4 Copyright (C) 2002 Mark Wedel & Crossfire Development Team
11 Copyright (C) 1992 Frank Tore Johansen 5 Copyright (C) 1992 Frank Tore Johansen
… …
22 16
23 You should have received a copy of the GNU General Public License 17 You should have received a copy of the GNU General Public License
24 along with this program; if not, write to the Free Software 18 along with this program; if not, write to the Free Software
25 Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. 19 Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
26 20
27 The authors can be reached via e-mail at crossfire-devel@real-time.com 21 The authors can be reached via e-mail at <crossfire@schmorp.de>
28*/ 22*/
29 23
30#include <cassert> 24#include <cassert>
31 25
32#include <tr1/unordered_map>
33
34#include <global.h> 26#include <global.h>
35#include <arch.h>
36#include <funcpoint.h> 27#include <funcpoint.h>
37#include <loader.h> 28#include <loader.h>
38 29
39/* IF set, does a little timing on the archetype load. */ 30#define USE_UNORDERED_MAP 0
40#define TIME_ARCH_LOAD 0
41 31
42static void add_arch (archetype *at); 32#if USE_UNORDERED_MAP
33# include <tr1/functional>
34# include <tr1/unordered_map>
35#endif
43 36
44static archetype *arch_table[ARCHTABLE];
45int arch_cmp = 0; /* How many strcmp's */ 37int arch_cmp = 0; /* How many strcmp's */
46int arch_search = 0; /* How many searches */ 38int arch_search = 0; /* How many searches */
47int arch_init; /* True if doing arch initialization */ 39int arch_init; /* True if doing arch initialization */
48 40
49/* The naming of these functions is really poor - they are all 41/* The naming of these functions is really poor - they are all
… …
54 * MSW 2003-04-29 46 * MSW 2003-04-29
55 */ 47 */
56 48
57#if USE_UNORDERED_MAP 49#if USE_UNORDERED_MAP
58// the hashtable 50// the hashtable
59typedef
60 std::tr1::unordered_map < 51typedef std::tr1::unordered_map
61size_t, archetype *> 52 <
53 std::size_t,
54 arch_ptr,
55 std::tr1::hash<size_t>,
56 std::equal_to<size_t>,
57 slice_allocator< std::pair<const std::size_t, archetype *> >
58 true,
62 HT; 59 > HT;
63 60
64static HT 61static HT ht;
65 ht; 62#else
63static arch_ptr arch_table[ARCHTABLE];
66#endif 64#endif
67 65
68/** 66/**
69 * GROS - This function retrieves an archetype given the name that appears 67 * GROS - This function retrieves an archetype given the name that appears
70 * during the game (for example, "writing pen" instead of "stylus"). 68 * during the game (for example, "writing pen" instead of "stylus").
… …
77 * - the archetype found or null if nothing was found. 75 * - the archetype found or null if nothing was found.
78 */ 76 */
79archetype * 77archetype *
80find_archetype_by_object_name (const char *name) 78find_archetype_by_object_name (const char *name)
81{ 79{
82 archetype * 80 archetype *at;
83 at;
84 81
85 if (name == NULL) 82 if (name == NULL)
86 return (archetype *) NULL; 83 return (archetype *) NULL;
87 84
88 for (at = first_archetype; at != NULL; at = at->next) 85 for (at = first_archetype; at != NULL; at = at->next)
… …
99 * except that it considers only items of the given type. 96 * except that it considers only items of the given type.
100 */ 97 */
101archetype * 98archetype *
102find_archetype_by_object_type_name (int type, const char *name) 99find_archetype_by_object_type_name (int type, const char *name)
103{ 100{
104 archetype * 101 archetype *at;
105 at;
106 102
107 if (name == NULL) 103 if (name == NULL)
108 return NULL; 104 return NULL;
109 105
110 for (at = first_archetype; at != NULL; at = at->next) 106 for (at = first_archetype; at != NULL; at = at->next)
… …
172 * but it otherwise had a big memory leak. 168 * but it otherwise had a big memory leak.
173 */ 169 */
174object * 170object *
175get_archetype_by_object_name (const char *name) 171get_archetype_by_object_name (const char *name)
176{ 172{
177 archetype * 173 archetype *at;
178 at;
179 char
180 tmpname[MAX_BUF]; 174 char tmpname[MAX_BUF];
181 int 175 int i;
182 i;
183 176
184 strncpy (tmpname, name, MAX_BUF - 1); 177 assign (tmpname, name);
185 tmpname[MAX_BUF - 1] = 0; 178
186 for (i = strlen (tmpname); i > 0; i--) 179 for (i = strlen (tmpname); i > 0; i--)
187 { 180 {
188 tmpname[i] = 0; 181 tmpname[i] = 0;
189 at = find_archetype_by_object_name (tmpname); 182 at = find_archetype_by_object_name (tmpname);
183
190 if (at != NULL) 184 if (at != NULL)
191 {
192 return arch_to_object (at); 185 return arch_to_object (at);
193 }
194 } 186 }
187
195 return create_singularity (name); 188 return create_singularity (name);
196} 189}
197 190
198 /* This is a subset of the parse_id command. Basically, name can be 191 /* 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. 192 * a string seperated lists of things to match, with certain keywords.
… …
213 * Last, make a check on the full name. 206 * Last, make a check on the full name.
214 */ 207 */
215int 208int
216item_matched_string (object *pl, object *op, const char *name) 209item_matched_string (object *pl, object *op, const char *name)
217{ 210{
218 char *
219 cp,
220 local_name[MAX_BUF]; 211 char *cp, local_name[MAX_BUF];
221 int 212 int count, retval = 0;
222 count,
223 retval = 0;
224 213
225 strcpy (local_name, name); /* strtok is destructive to name */ 214 strcpy (local_name, name); /* strtok is destructive to name */
226 215
227 for (cp = strtok (local_name, ","); cp; cp = strtok (NULL, ",")) 216 for (cp = strtok (local_name, ","); cp; cp = strtok (NULL, ","))
228 { 217 {
… …
280 retval = 15; 269 retval = 15;
281 else if (!strncasecmp (cp, query_base_name (op, 0), strlen (cp))) 270 else if (!strncasecmp (cp, query_base_name (op, 0), strlen (cp)))
282 retval = 14; 271 retval = 14;
283 else if (!strncasecmp (cp, query_base_name (op, 1), strlen (cp))) 272 else if (!strncasecmp (cp, query_base_name (op, 1), strlen (cp)))
284 retval = 14; 273 retval = 14;
285
286 /* Do substring checks, so things like 'Str+1' will match. 274 /* Do substring checks, so things like 'Str+1' will match.
287 * retval of these should perhaps be lower - they are lower 275 * retval of these should perhaps be lower - they are lower
288 * then the specific strcasecmp aboves, but still higher than 276 * then the specific strcasecmp aboves, but still higher than
289 * some other match criteria. 277 * some other match criteria.
290 */ 278 */
… …
292 retval = 12; 280 retval = 12;
293 else if (strstr (query_base_name (op, 0), cp)) 281 else if (strstr (query_base_name (op, 0), cp))
294 retval = 12; 282 retval = 12;
295 else if (strstr (query_short_name (op), cp)) 283 else if (strstr (query_short_name (op), cp))
296 retval = 12; 284 retval = 12;
297
298 /* Check against plural/non plural based on count. */ 285 /* Check against plural/non plural based on count. */
299 else if (count > 1 && !strcasecmp (cp, op->name_pl)) 286 else if (count > 1 && !strcasecmp (cp, op->name_pl))
300 {
301 retval = 6; 287 retval = 6;
302 }
303 else if (count == 1 && !strcasecmp (op->name, cp)) 288 else if (count == 1 && !strcasecmp (op->name, cp))
304 {
305 retval = 6; 289 retval = 6;
306 }
307 /* base name matched - not bad */ 290 /* base name matched - not bad */
308 else if (strcasecmp (cp, op->name) == 0 && !count) 291 else if (strcasecmp (cp, op->name) == 0 && !count)
309 retval = 4; 292 retval = 4;
310 /* Check for partial custom name, but give a real low priority */ 293 /* Check for partial custom name, but give a real low priority */
311 else if (op->custom_name && strstr (op->custom_name, cp)) 294 else if (op->custom_name && strstr (op->custom_name, cp))
… …
313 296
314 if (retval) 297 if (retval)
315 { 298 {
316 if (pl->type == PLAYER) 299 if (pl->type == PLAYER)
317 pl->contr->count = count; 300 pl->contr->count = count;
301
318 return retval; 302 return retval;
319 } 303 }
320 } 304 }
305
321 return 0; 306 return 0;
322} 307}
323 308
324/* 309/*
325 * Initialises the internal linked list of archetypes (read from file). 310 * Initialises the internal linked list of archetypes (read from file).
… …
330void 315void
331init_archetypes (void) 316init_archetypes (void)
332{ /* called from add_player() and edit() */ 317{ /* called from add_player() and edit() */
333 if (first_archetype != NULL) /* Only do this once */ 318 if (first_archetype != NULL) /* Only do this once */
334 return; 319 return;
320
335 arch_init = 1; 321 arch_init = 1;
336 load_archetypes (); 322 load_archetypes ();
337 arch_init = 0; 323 arch_init = 0;
338 empty_archetype = find_archetype ("empty_archetype"); 324 empty_archetype = archetype::find ("empty_archetype");
339 325
340/* init_blocksview();*/ 326/* init_blocksview();*/
341} 327}
342 328
343/* 329/*
… …
367 */ 353 */
368 354
369void 355void
370init_archetable (void) 356init_archetable (void)
371{ 357{
372 archetype * 358 archetype *at;
373 at;
374 359
375 LOG (llevDebug, " Setting up archetable...\n"); 360 LOG (llevDebug, " Setting up archetable...\n");
376 361
377 for (at = first_archetype; at != NULL; at = (at->more == NULL) ? at->next : at->more) 362 for (at = first_archetype; at != NULL; at = (at->more == NULL) ? at->next : at->more)
378 add_arch (at); 363 at->hash_add ();
379 364
380 LOG (llevDebug, "done\n"); 365 LOG (llevDebug, "done\n");
381} 366}
382 367
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 368void
413free_all_archs (void) 369free_all_archs (void)
414{ 370{
415 archetype * 371 archetype *at, *next;
416 at, *
417 next;
418 int
419 i = 0, f = 0; 372 int i = 0, f = 0;
420 373
421 for (at = first_archetype; at != NULL; at = next) 374 for (at = first_archetype; at != NULL; at = next)
422 { 375 {
423 if (at->more) 376 if (at->more)
424 next = at->more; 377 next = at->more;
425 else 378 else
426 next = at->next; 379 next = at->next;
427 380
428 delete at; 381 delete
382 at;
383
429 i++; 384 i++;
430 } 385 }
386
431 LOG (llevDebug, "Freed %d archetypes, %d faces\n", i, f); 387 LOG (llevDebug, "Freed %d archetypes, %d faces\n", i, f);
432} 388}
433 389
434archetype::archetype () 390archetype::archetype ()
435{ 391{
… …
447 * of archetype-structures. 403 * of archetype-structures.
448 */ 404 */
449void 405void
450first_arch_pass (object_thawer & fp) 406first_arch_pass (object_thawer & fp)
451{ 407{
452 archetype *
453 at, *
454 head = NULL, *last_more = NULL; 408 archetype *at, *head = NULL, *last_more = NULL;
455 409
456 at->clone.arch = first_archetype = at = new archetype; 410 at->clone.arch = first_archetype = at = new archetype;
457 411
458 while (int i = load_object (fp, &at->clone, 0)) 412 while (int i = load_object (fp, &at->clone, 0))
459 { 413 {
… …
517 at = new archetype; 471 at = new archetype;
518 472
519 at->clone.arch = at; 473 at->clone.arch = at;
520 } 474 }
521 475
522 delete 476 delete at;
523 at;
524} 477}
525 478
526/* 479/*
527 * Reads the archetype file once more, and links all pointers between 480 * Reads the archetype file once more, and links all pointers between
528 * archetypes. 481 * archetypes.
529 */ 482 */
530 483
531void 484void
532second_arch_pass (object_thawer & thawer) 485second_arch_pass (object_thawer & thawer)
533{ 486{
534 char
535 buf[MAX_BUF], *
536 variable = buf, *argument, *cp; 487 char buf[MAX_BUF], *variable = buf, *argument, *cp;
537 archetype *
538 at = NULL, *other; 488 archetype *at = NULL, *other;
539 489
540 while (fgets (buf, MAX_BUF, thawer) != NULL) 490 while (fgets (buf, MAX_BUF, thawer) != NULL)
541 { 491 {
542 if (*buf == '#') 492 if (*buf == '#')
543 continue; 493 continue;
… …
551 cp--; 501 cp--;
552 } 502 }
553 } 503 }
554 if (!strcmp ("Object", variable)) 504 if (!strcmp ("Object", variable))
555 { 505 {
556 if ((at = find_archetype (argument)) == NULL) 506 if ((at = archetype::find (argument)) == NULL)
557 LOG (llevError, "Warning: failed to find arch %s\n", argument); 507 LOG (llevError, "Warning: failed to find arch %s\n", argument);
558 } 508 }
559 else if (!strcmp ("other_arch", variable)) 509 else if (!strcmp ("other_arch", variable))
560 { 510 {
561 if (at != NULL && at->clone.other_arch == NULL) 511 if (at != NULL && at->clone.other_arch == NULL)
562 { 512 {
563 if ((other = find_archetype (argument)) == NULL) 513 if ((other = archetype::find (argument)) == NULL)
564 LOG (llevError, "Warning: failed to find other_arch %s\n", argument); 514 LOG (llevError, "Warning: failed to find other_arch %s\n", argument);
565 else if (at != NULL) 515 else if (at != NULL)
566 at->clone.other_arch = other; 516 at->clone.other_arch = other;
567 } 517 }
568 } 518 }
569 else if (!strcmp ("randomitems", variable)) 519 else if (!strcmp ("randomitems", variable))
570 { 520 {
571 if (at != NULL) 521 if (at != NULL)
572 { 522 {
573 treasurelist *
574 tl = find_treasurelist (argument); 523 treasurelist *tl = find_treasurelist (argument);
575 524
576 if (tl == NULL) 525 if (tl == NULL)
577 LOG (llevError, "Failed to link treasure to arch (%s): %s\n", &at->name, argument); 526 LOG (llevError, "Failed to link treasure to arch (%s): %s\n", &at->name, argument);
578 else 527 else
579 at->clone.randomitems = tl; 528 at->clone.randomitems = tl;
… …
584 533
585#ifdef DEBUG 534#ifdef DEBUG
586void 535void
587check_generators (void) 536check_generators (void)
588{ 537{
589 archetype * 538 archetype *at;
590 at;
591 539
592 for (at = first_archetype; at != NULL; at = at->next) 540 for (at = first_archetype; at != NULL; at = at->next)
593 if (QUERY_FLAG (&at->clone, FLAG_GENERATOR) && at->clone.other_arch == NULL) 541 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); 542 LOG (llevError, "Warning: %s is generator but lacks other_arch.\n", &at->name);
595} 543}
… …
603 */ 551 */
604 552
605void 553void
606load_archetypes (void) 554load_archetypes (void)
607{ 555{
608 char
609 filename[MAX_BUF]; 556 char filename[MAX_BUF];
610
611#if TIME_ARCH_LOAD
612 struct timeval
613 tv1,
614 tv2;
615#endif
616 557
617 sprintf (filename, "%s/%s", settings.datadir, settings.archetypes); 558 sprintf (filename, "%s/%s", settings.datadir, settings.archetypes);
618 LOG (llevDebug, "Reading archetypes from %s:\n", filename); 559 LOG (llevDebug, "Reading archetypes from %s:\n", filename);
619 560
620 { 561 {
562 object_thawer
621 object_thawer thawer (filename); 563 thawer (filename);
622 564
623 clear_archetable (); 565 clear_archetable ();
624 LOG (llevDebug, " arch-pass 1...\n"); 566 LOG (llevDebug, " arch-pass 1...\n");
625 first_arch_pass (thawer); 567 first_arch_pass (thawer);
626 LOG (llevDebug, " done\n"); 568 LOG (llevDebug, " done\n");
… …
628 570
629 init_archetable (); 571 init_archetable ();
630 warn_archetypes = 1; 572 warn_archetypes = 1;
631 573
632 { 574 {
575 object_thawer
633 object_thawer thawer (filename); 576 thawer (filename);
634 577
635 LOG (llevDebug, " loading treasure...\n"); 578 LOG (llevDebug, " loading treasure...\n");
636 load_treasures (); 579 load_treasures ();
637 LOG (llevDebug, " done\n arch-pass 2...\n"); 580 LOG (llevDebug, " done\n arch-pass 2...\n");
638 second_arch_pass (thawer); 581 second_arch_pass (thawer);
… …
650 */ 593 */
651 594
652object * 595object *
653arch_to_object (archetype *at) 596arch_to_object (archetype *at)
654{ 597{
655 object * 598 object *op;
656 op;
657 599
658 if (at == NULL) 600 if (at == NULL)
659 { 601 {
660 if (warn_archetypes) 602 if (warn_archetypes)
661 LOG (llevError, "Couldn't find archetype.\n"); 603 LOG (llevError, "Couldn't find archetype.\n");
… …
678 */ 620 */
679 621
680object * 622object *
681create_singularity (const char *name) 623create_singularity (const char *name)
682{ 624{
683 object * 625 object *op;
684 op;
685 char
686 buf[MAX_BUF]; 626 char buf[MAX_BUF];
687 627
688 sprintf (buf, "%s (%s)", ARCH_SINGULARITY, name); 628 sprintf (buf, "%s (%s)", ARCH_SINGULARITY, name);
689 op = get_object (); 629 op = get_object ();
690 op->name = op->name_pl = buf; 630 op->name = op->name_pl = buf;
691 SET_FLAG (op, FLAG_NO_PICK); 631 SET_FLAG (op, FLAG_NO_PICK);
… …
698 */ 638 */
699 639
700object * 640object *
701get_archetype (const char *name) 641get_archetype (const char *name)
702{ 642{
703 archetype * 643 archetype *at = archetype::find (name);
704 at;
705 644
706 at = find_archetype (name); 645 if (!at)
707 if (at == NULL)
708 return create_singularity (name); 646 return create_singularity (name);
709 647
710 return arch_to_object (at); 648 return arch_to_object (at);
711} 649}
712 650
… …
715 */ 653 */
716 654
717unsigned long 655unsigned long
718hasharch (const char *str, int tablesize) 656hasharch (const char *str, int tablesize)
719{ 657{
720 unsigned long 658 unsigned long hash = 0;
721 hash = 0;
722 unsigned int 659 unsigned int i = 0;
723 i = 0;
724 const char * 660 const char *p;
725 p;
726 661
727 /* use the one-at-a-time hash function, which supposedly is 662 /* use the one-at-a-time hash function, which supposedly is
728 * better than the djb2-like one used by perl5.005, but 663 * better than the djb2-like one used by perl5.005, but
729 * certainly is better then the bug used here before. 664 * certainly is better then the bug used here before.
730 * see http://burtleburtle.net/bob/hash/doobs.html 665 * see http://burtleburtle.net/bob/hash/doobs.html
… …
747 * Finds, using the hashtable, which archetype matches the given name. 682 * Finds, using the hashtable, which archetype matches the given name.
748 * returns a pointer to the found archetype, otherwise NULL. 683 * returns a pointer to the found archetype, otherwise NULL.
749 */ 684 */
750 685
751archetype * 686archetype *
752find_archetype (const char *name) 687archetype::find (const char *name)
753{ 688{
754#if USE_UNORDERED_MAP
755 name = shstr::find (name);
756
757 if (!name) 689 if (!name)
758 return 0; 690 return 0;
759 691
760 HT::const_iterator i = ht.find ((size_t) name); 692#if USE_UNORDERED_MAP
693 AUTODECL (i, ht.find ((size_t) name));
761 694
762 if (i == ht.end ()) 695 if (i == ht.end ())
763 return 0; 696 return 0;
764 else 697 else
765 return i->second; 698 return i->second;
766#endif 699#endif
767 700
768 archetype * 701 archetype *at;
769 at;
770 unsigned long 702 unsigned long index;
771 index;
772
773 if (name == NULL)
774 return (archetype *) NULL;
775 703
776 index = hasharch (name, ARCHTABLE); 704 index = hasharch (name, ARCHTABLE);
777 arch_search++; 705 arch_search++;
778 for (;;) 706 for (;;)
779 { 707 {
780 at = arch_table[index]; 708 at = arch_table[index];
709
781 if (at == NULL) 710 if (at == NULL)
782 { 711 {
783 if (warn_archetypes) 712 if (warn_archetypes)
784 LOG (llevError, "Couldn't find archetype %s\n", name); 713 LOG (llevError, "Couldn't find archetype %s\n", name);
714
785 return NULL; 715 return NULL;
786 } 716 }
717
787 arch_cmp++; 718 arch_cmp++;
719
788 if (!strcmp ((const char *) at->name, name)) 720 if (!strcmp ((const char *) at->name, name))
789 return at; 721 return at;
722
790 if (++index >= ARCHTABLE) 723 if (++index >= ARCHTABLE)
791 index = 0; 724 index = 0;
792 } 725 }
793} 726}
794 727
795/* 728/*
796 * Adds an archetype to the hashtable. 729 * Adds an archetype to the hashtable.
797 */ 730 */
798 731void
799static void 732archetype::hash_add ()
800add_arch (archetype *at)
801{ 733{
802#if USE_UNORDERED_MAP 734#if USE_UNORDERED_MAP
803 ht.insert (std::make_pair ((size_t) (const char *) at->name, at)); 735 ht.insert (std::make_pair ((size_t) (const char *) name, this));
804#endif 736#else
805 737
806 int
807 index = hasharch ((const char *) at->name, ARCHTABLE), org_index = index; 738 int index = hasharch ((const char *) name, ARCHTABLE), org_index = index;
808 739
809 for (;;) 740 for (;;)
810 { 741 {
811 if (arch_table[index] == NULL) 742 if (!arch_table[index])
812 { 743 {
813 arch_table[index] = at; 744 arch_table[index] = this;
814 return; 745 break;
815 } 746 }
816 747
817 if (++index == ARCHTABLE) 748 if (++index == ARCHTABLE)
818 index = 0; 749 index = 0;
819 750
820 if (index == org_index) 751 if (index == org_index)
821 fatal (ARCHTABLE_TOO_SMALL); 752 fatal (ARCHTABLE_TOO_SMALL);
822 } 753 }
754#endif
755}
756
757void
758archetype::hash_del ()
759{
760#if USE_UNORDERED_MAP
761# error remove this from HT
762#else
763
764 int index = hasharch ((const char *) name, ARCHTABLE), org_index = index;
765
766 for (;;)
767 {
768 if (arch_table[index] == this)
769 {
770 arch_table[index] = 0;
771 break;
772 }
773
774 if (++index == ARCHTABLE)
775 index = 0;
776
777 if (index == org_index)
778 break;
779 }
780#endif
823} 781}
824 782
825/* 783/*
826 * Returns the first archetype using the given type. 784 * Returns the first archetype using the given type.
827 * Used in treasure-generation. 785 * Used in treasure-generation.
828 */ 786 */
829 787
830archetype * 788archetype *
831type_to_archetype (int type) 789type_to_archetype (int type)
832{ 790{
833 archetype * 791 archetype *at;
834 at;
835 792
836 for (at = first_archetype; at != NULL; at = (at->more == NULL) ? at->next : at->more) 793 for (at = first_archetype; at; at = at->more == 0 ? at->next : at->more)
837 if (at->clone.type == type) 794 if (at->clone.type == type)
838 return at; 795 return at;
796
839 return NULL; 797 return 0;
840} 798}
841 799
842/* 800/*
843 * Returns a new object copied from the first archetype matching 801 * Returns a new object copied from the first archetype matching
844 * the given type. 802 * the given type.
… …
846 */ 804 */
847 805
848object * 806object *
849clone_arch (int type) 807clone_arch (int type)
850{ 808{
851 archetype * 809 archetype *at;
852 at;
853 object *
854 op = get_object (); 810 object *op = get_object ();
855 811
856 if ((at = type_to_archetype (type)) == NULL) 812 if ((at = type_to_archetype (type)) == NULL)
857 { 813 {
858 LOG (llevError, "Can't clone archetype %d\n", type); 814 LOG (llevError, "Can't clone archetype %d\n", type);
859 free_object (op); 815 free_object (op);
860 return NULL; 816 return NULL;
861 } 817 }
818
862 copy_object (&at->clone, op); 819 copy_object (&at->clone, op);
863 op->instantiate (); 820 op->instantiate ();
864 return op; 821 return op;
865} 822}
866 823
… …
869 */ 826 */
870 827
871object * 828object *
872object_create_arch (archetype *at) 829object_create_arch (archetype *at)
873{ 830{
874 object * 831 object *op, *prev = 0, *head = 0;
875 op, *
876 prev = NULL, *head = NULL;
877 832
878 while (at) 833 while (at)
879 { 834 {
880 op = arch_to_object (at); 835 op = arch_to_object (at);
881 op->x = at->clone.x; 836 op->x = at->clone.x;
882 op->y = at->clone.y; 837 op->y = at->clone.y;
838
883 if (head) 839 if (head)
884 op->head = head, prev->more = op; 840 op->head = head, prev->more = op;
841
885 if (!head) 842 if (!head)
886 head = op; 843 head = op;
844
887 prev = op; 845 prev = op;
888 at = at->more; 846 at = at->more;
889 } 847 }
848
890 return (head); 849 return (head);
891} 850}
892 851
893/*** end of arch.c ***/

Diff Legend

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