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.31 by root, Wed Dec 13 03:28:42 2006 UTC vs.
Revision 1.36 by pippijn, Sat Jan 6 14:42:28 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
… …
118 * If type is -1, ew don't match on type. 119 * If type is -1, ew don't match on type.
119 */ 120 */
120object * 121object *
121get_archetype_by_skill_name (const char *skill, int type) 122get_archetype_by_skill_name (const char *skill, int type)
122{ 123{
123 archetype * 124 archetype *at;
124 at;
125 125
126 if (skill == NULL) 126 if (skill)
127 return NULL;
128
129 for (at = first_archetype; at != NULL; at = at->next) 127 for (at = first_archetype; at; at = at->next)
130 {
131 if (((type == -1) || (type == at->clone.type)) && (!strcmp (at->clone.skill, skill))) 128 if (((type == -1) || (type == at->clone.type)) && (!strcmp (at->clone.skill, skill)))
132 return arch_to_object (at); 129 return arch_to_object (at);
133 } 130
134 return NULL; 131 return 0;
135} 132}
136 133
137/* similiar to above - this returns the first archetype 134/* similiar to above - this returns the first archetype
138 * that matches both the type and subtype. type and subtype 135 * 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 136 * can be -1 to say ignore, but in this case, the match it does
… …
179 for (i = strlen (tmpname); i > 0; i--) 176 for (i = strlen (tmpname); i > 0; i--)
180 { 177 {
181 tmpname[i] = 0; 178 tmpname[i] = 0;
182 at = find_archetype_by_object_name (tmpname); 179 at = find_archetype_by_object_name (tmpname);
183 180
184 if (at != NULL) 181 if (at)
185 return arch_to_object (at); 182 return arch_to_object (at);
186 } 183 }
187 184
188 return create_singularity (name); 185 return create_singularity (name);
189} 186}
… …
387 LOG (llevDebug, "Freed %d archetypes, %d faces\n", i, f); 384 LOG (llevDebug, "Freed %d archetypes, %d faces\n", i, f);
388} 385}
389 386
390archetype::archetype () 387archetype::archetype ()
391{ 388{
392 clone.clear (); /* to initial state other also */
393 CLEAR_FLAG (&clone, FLAG_FREED); /* This shouldn't matter, since copy_to */ 389 CLEAR_FLAG (&clone, FLAG_FREED); /* This shouldn't matter, since copy_to */
394 SET_FLAG (&clone, FLAG_REMOVED); /* doesn't copy these flags... */ 390 SET_FLAG (&clone, FLAG_REMOVED); /* doesn't copy these flags... */
395} 391}
396 392
397archetype::~archetype () 393archetype::~archetype ()
… …
576 object_thawer 572 object_thawer
577 thawer (filename); 573 thawer (filename);
578 574
579 LOG (llevDebug, " loading treasure...\n"); 575 LOG (llevDebug, " loading treasure...\n");
580 load_treasures (); 576 load_treasures ();
577 LOG (llevDebug, " done\n");
581 LOG (llevDebug, " done\n arch-pass 2...\n"); 578 LOG (llevDebug, " arch-pass 2...\n");
582 second_arch_pass (thawer); 579 second_arch_pass (thawer);
583 LOG (llevDebug, " done\n"); 580 LOG (llevDebug, " done\n");
584#ifdef DEBUG 581#ifdef DEBUG
585 check_generators (); 582 check_generators ();
586#endif 583#endif
… …
590 587
591/* 588/*
592 * Creates and returns a new object which is a copy of the given archetype. 589 * Creates and returns a new object which is a copy of the given archetype.
593 * This function returns NULL on failure. 590 * This function returns NULL on failure.
594 */ 591 */
595
596object * 592object *
597arch_to_object (archetype *at) 593arch_to_object (archetype *at)
598{ 594{
599 object *op; 595 object *op;
600 596
… …
616 * Creates an object. This function is called by get_archetype() 612 * Creates an object. This function is called by get_archetype()
617 * if it fails to find the appropriate archetype. 613 * if it fails to find the appropriate archetype.
618 * Thus get_archetype() will be guaranteed to always return 614 * Thus get_archetype() will be guaranteed to always return
619 * an object, and never NULL. 615 * an object, and never NULL.
620 */ 616 */
621
622object * 617object *
623create_singularity (const char *name) 618create_singularity (const char *name)
624{ 619{
625 object *op; 620 object *op;
626 char buf[MAX_BUF]; 621 char buf[MAX_BUF];
… …
634 629
635/* 630/*
636 * Finds which archetype matches the given name, and returns a new 631 * Finds which archetype matches the given name, and returns a new
637 * object containing a copy of the archetype. 632 * object containing a copy of the archetype.
638 */ 633 */
639
640object * 634object *
641get_archetype (const char *name) 635get_archetype (const char *name)
642{ 636{
643 archetype *at = archetype::find (name); 637 archetype *at = archetype::find (name);
644 638

Diff Legend

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