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.79 by root, Sun May 4 11:12:40 2008 UTC vs.
Revision 1.90 by root, Fri Oct 16 00:30:19 2009 UTC

… …
3 * 3 *
4 * Copyright (©) 2005,2006,2007,2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team 4 * Copyright (©) 2005,2006,2007,2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
5 * Copyright (©) 2002,2007 Mark Wedel & Crossfire Development Team 5 * Copyright (©) 2002,2007 Mark Wedel & Crossfire Development Team
6 * Copyright (©) 1992,2007 Frank Tore Johansen 6 * Copyright (©) 1992,2007 Frank Tore Johansen
7 * 7 *
8 * Deliantra is free software: you can redistribute it and/or modify 8 * Deliantra is free software: you can redistribute it and/or modify it under
9 * it under the terms of the GNU General Public License as published by 9 * the terms of the Affero GNU General Public License as published by the
10 * the Free Software Foundation, either version 3 of the License, or 10 * Free Software Foundation, either version 3 of the License, or (at your
11 * (at your option) any later version. 11 * option) any later version.
12 * 12 *
13 * 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,
14 * but WITHOUT ANY WARRANTY; without even the implied warranty of 14 * but WITHOUT ANY WARRANTY; without even the implied warranty of
15 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the 15 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
16 * GNU General Public License for more details. 16 * GNU General Public License for more details.
17 * 17 *
18 * You should have received a copy of the GNU General Public License 18 * You should have received a copy of the Affero GNU General Public License
19 * along with this program. If not, see <http://www.gnu.org/licenses/>. 19 * and the GNU General Public License along with this program. If not, see
20 * <http://www.gnu.org/licenses/>.
20 * 21 *
21 * The authors can be reached via e-mail to <support@deliantra.net> 22 * The authors can be reached via e-mail to <support@deliantra.net>
22 */ 23 */
23 24
24#include <cassert> 25#include <cassert>
… …
102{ 103{
103 shstr_cmp skill_cmp (skill); 104 shstr_cmp skill_cmp (skill);
104 105
105 for_all_archetypes (at) 106 for_all_archetypes (at)
106 if (at->skill == skill_cmp && (type == -1 || type == at->type)) 107 if (at->skill == skill_cmp && (type == -1 || type == at->type))
107 return arch_to_object (at); 108 return at->instance ();
108 109
109 return 0; 110 return 0;
110} 111}
111 112
112/* similiar to above - this returns the first archetype 113/* similiar to above - this returns the first archetype
… …
140 */ 141 */
141object * 142object *
142get_archetype_by_object_name (const char *name) 143get_archetype_by_object_name (const char *name)
143{ 144{
144 char tmpname[MAX_BUF]; 145 char tmpname[MAX_BUF];
145 int i;
146 146
147 assign (tmpname, name); 147 assign (tmpname, name);
148 148
149 for (i = strlen (tmpname); i > 0; i--) 149 for (int i = strlen (tmpname); i > 0; i--)
150 { 150 {
151 tmpname[i] = 0; 151 tmpname[i] = 0;
152 152
153 if (archetype *at = find_archetype_by_object_name (tmpname)) 153 if (archetype *at = find_archetype_by_object_name (tmpname))
154 return arch_to_object (at); 154 return at->instance ();
155 } 155 }
156 156
157 return create_singularity (name); 157 return create_singularity (name);
158} 158}
159 159
… …
193 return 1; 193 return 1;
194 194
195 /* unpaid is a little more specific */ 195 /* unpaid is a little more specific */
196 if (!strcmp (cp, "unpaid") && QUERY_FLAG (op, FLAG_UNPAID)) 196 if (!strcmp (cp, "unpaid") && QUERY_FLAG (op, FLAG_UNPAID))
197 return 2; 197 return 2;
198
198 if (!strcmp (cp, "cursed") && QUERY_FLAG (op, FLAG_KNOWN_CURSED) && (QUERY_FLAG (op, FLAG_CURSED) || QUERY_FLAG (op, FLAG_DAMNED))) 199 if (!strcmp (cp, "cursed") && QUERY_FLAG (op, FLAG_KNOWN_CURSED) && (QUERY_FLAG (op, FLAG_CURSED) || QUERY_FLAG (op, FLAG_DAMNED)))
199 return 2; 200 return 2;
200 201
201 if (!strcmp (cp, "unlocked") && !QUERY_FLAG (op, FLAG_INV_LOCKED)) 202 if (!strcmp (cp, "unlocked") && !QUERY_FLAG (op, FLAG_INV_LOCKED))
202 return 2; 203 return 2;
… …
258 retval = 6; 259 retval = 6;
259 /* base name matched - not bad */ 260 /* base name matched - not bad */
260 else if (strcasecmp (cp, op->name) == 0 && !count) 261 else if (strcasecmp (cp, op->name) == 0 && !count)
261 retval = 4; 262 retval = 4;
262 /* Check for partial custom name, but give a real low priority */ 263 /* Check for partial custom name, but give a real low priority */
263 else if (op->custom_name && strstr (op->custom_name, cp)) 264 else if (op->custom_name.contains (cp))
264 retval = 3; 265 retval = 3;
265 266
266 if (retval) 267 if (retval)
267 { 268 {
268 if (pl->type == PLAYER) 269 if (pl->type == PLAYER)
… …
440 return new_head; 441 return new_head;
441 } 442 }
442 443
443fail: 444fail:
444 for (auto (p, parts.begin ()); p != parts.end (); ++p) 445 for (auto (p, parts.begin ()); p != parts.end (); ++p)
445 (*p)->destroy (true); 446 (*p)->destroy ();
446 447
447 return 0; 448 return 0;
448} 449}
449 450
450void 451void
… …
510 511
511 if (at->refcnt_cnt () > 1) // all arches have ONE refcount from their object 512 if (at->refcnt_cnt () > 1) // all arches have ONE refcount from their object
512 ++idx; 513 ++idx;
513 else 514 else
514 { 515 {
515 LOG (llevDebug, "garbage collect arch %s", at->debug_desc ()); 516 LOG (llevDebug, "garbage collect arch %s", &at->archname);
516 assert (at->arch == at); // verify that refcnt == 1 is truly valid 517 assert (at->arch == at); // verify that refcnt == 1 is truly valid
517 allarch.erase (idx); 518 allarch.erase (idx);
518 519
519 // break chain 520 // break chain
520 for (object *op = at->head_ (); op; ) 521 for (object *op = at->head_ (); op; )
… …
530 } 531 }
531 } 532 }
532 while (--cnt); 533 while (--cnt);
533} 534}
534 535
535/*
536 * Creates and returns a new object which is a copy of the given archetype.
537 * This function returns NULL on failure.
538 */
539object * 536object *
540arch_to_object (archetype *at) 537archetype::instance ()
541{ 538{
542 if (!at)
543 {
544 LOG (llevError, "Couldn't find archetype.\n");
545 return 0;
546 }
547
548 object *op = at->clone (); 539 object *op = clone ();
549 op->arch = at;
550 op->instantiate (); 540 op->instantiate ();
551
552 return op; 541 return op;
553}
554
555object *
556archetype::instance ()
557{
558 return arch_to_object (this);
559} 542}
560 543
561/* 544/*
562 * Creates an object. This function is called by get_archetype() 545 * Creates an object. This function is called by get_archetype()
563 * if it fails to find the appropriate archetype. 546 * if it fails to find the appropriate archetype.
… …
570 LOG (llevError | logBacktrace, "FATAL: creating singularity for '%s'.\n", name); 553 LOG (llevError | logBacktrace, "FATAL: creating singularity for '%s'.\n", name);
571 554
572 if (!strcmp (name, "bug")) 555 if (!strcmp (name, "bug"))
573 abort (); 556 abort ();
574 557
575 char buf[MAX_BUF];
576 sprintf (buf, "bug, please report (%s)", name);
577
578 object *op = get_archetype ("bug"); 558 object *op = archetype::get (shstr_bug);
579 op->name = op->name_pl = buf; 559 op->name = op->name_pl = format ("bug, please report (missing archetype %s)", name);
580 560
581 return op; 561 return op;
582} 562}
583 563
584/* 564/*
… …
586 * object containing a copy of the archetype. 566 * object containing a copy of the archetype.
587 */ 567 */
588object * 568object *
589get_archetype (const char *name) 569get_archetype (const char *name)
590{ 570{
571 return archetype::get (name);
572}
573
574object *
575archetype::get (const char *name)
576{
591 archetype *at = archetype::find (name); 577 archetype *at = find (name);
592 578
593 if (!at) 579 if (!at)
594 return create_singularity (name); 580 return create_singularity (name);
595 581
596 return arch_to_object (at); 582 return at->instance ();
597}
598
599object *
600archetype::get (const char *name)
601{
602 return get_archetype (name);
603} 583}
604 584
605/* 585/*
606 * Returns the first archetype using the given type. 586 * Returns the first archetype using the given type.
607 * Used in treasure-generation. 587 * Used in treasure-generation.
… …
622 * Used in treasure-generation. 602 * Used in treasure-generation.
623 */ 603 */
624object * 604object *
625clone_arch (int type) 605clone_arch (int type)
626{ 606{
627 archetype *at; 607 archetype *at = type_to_archetype (type);
628 608
629 if ((at = type_to_archetype (type)) == NULL) 609 if (!at)
630 { 610 {
631 LOG (llevError, "Can't clone archetype %d\n", type); 611 LOG (llevError, "Can't clone archetype %d\n", type);
632 return 0; 612 return 0;
633 } 613 }
634 614
635 object *op = at->clone (); 615 return at->instance ();
636 op->instantiate ();
637 return op;
638} 616}
639 617
640/* 618/*
641 * member: make instance from class 619 * member: make instance from class
642 */ 620 */
… …
645{ 623{
646 object *op, *prev = 0, *head = 0; 624 object *op, *prev = 0, *head = 0;
647 625
648 while (at) 626 while (at)
649 { 627 {
650 op = arch_to_object (at); 628 op = at->instance ();
651 629
652 op->x = at->x; 630 op->x = at->x;
653 op->y = at->y; 631 op->y = at->y;
654 632
655 if (head) 633 if (head)

Diff Legend

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