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.76 by root, Wed Apr 30 06:40:28 2008 UTC vs.
Revision 1.91 by root, Tue Oct 27 01:38:39 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
… …
133 * - name: The name we're searching for (ex: "writing pen"); 134 * - name: The name we're searching for (ex: "writing pen");
134 * Return value: 135 * Return value:
135 * - a corresponding object if found; a singularity object if not found. 136 * - a corresponding object if found; a singularity object if not found.
136 * Note by MSW - it appears that it takes the full name and keeps 137 * Note by MSW - it appears that it takes the full name and keeps
137 * shortening it until it finds a match. I re-wrote this so that it 138 * shortening it until it finds a match. I re-wrote this so that it
138 * doesn't malloc it each time - not that this function is used much, 139 * doesn't allocate it each time - not that this function is used much,
139 * but it otherwise had a big memory leak. 140 * but it otherwise had a big memory leak.
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;
… …
224 * is because of the 'else' handling - we don't want to match on 225 * is because of the 'else' handling - we don't want to match on
225 * something and set a low retval, even though it may match a higher retcal 226 * something and set a low retval, even though it may match a higher retcal
226 * later. So keep it in descending order here, so we try for the best 227 * later. So keep it in descending order here, so we try for the best
227 * match first, and work downward. 228 * match first, and work downward.
228 */ 229 */
230 const char *qbn0, *qbn1, *qsn; // query base name/short name caches
231
229 if (!strcasecmp (cp, query_name (op))) 232 if (!strcasecmp (cp, query_name (op)))
230 retval = 20; 233 retval = 20;
231 else if (!strcasecmp (cp, query_short_name (op))) 234 else if (!strcasecmp (cp, qsn = query_short_name (op)))
232 retval = 18; 235 retval = 18;
233 else if (!strcasecmp (cp, query_base_name (op, 0))) 236 else if (!strcasecmp (cp, qbn0 = query_base_name (op, 0)))
234 retval = 16; 237 retval = 16;
235 else if (!strcasecmp (cp, query_base_name (op, 1))) 238 else if (!strcasecmp (cp, qbn1 = query_base_name (op, 1)))
236 retval = 16; 239 retval = 16;
237 else if (op->custom_name && !strcasecmp (cp, op->custom_name)) 240 else if (op->custom_name && !strcasecmp (cp, op->custom_name))
238 retval = 15; 241 retval = 15;
239 else if (!strncasecmp (cp, query_base_name (op, 0), strlen (cp))) 242 else if (!strncasecmp (cp, qbn0, strlen (cp)))
240 retval = 14; 243 retval = 14;
241 else if (!strncasecmp (cp, query_base_name (op, 1), strlen (cp))) 244 else if (!strncasecmp (cp, qbn1, strlen (cp)))
242 retval = 14; 245 retval = 14;
243 /* Do substring checks, so things like 'Str+1' will match. 246 /* Do substring checks, so things like 'Str+1' will match.
244 * retval of these should perhaps be lower - they are lower 247 * retval of these should perhaps be lower - they are lower
245 * then the specific strcasecmp aboves, but still higher than 248 * then the specific strcasecmp aboves, but still higher than
246 * some other match criteria. 249 * some other match criteria.
247 */ 250 */
248 else if (strstr (query_base_name (op, 1), cp)) 251 else if (strstr (qbn1, cp))
249 retval = 12; 252 retval = 12;
250 else if (strstr (query_base_name (op, 0), cp)) 253 else if (strstr (qbn0, cp))
251 retval = 12; 254 retval = 12;
252 else if (strstr (query_short_name (op), cp)) 255 else if (strstr (qsn, cp))
253 retval = 12; 256 retval = 12;
254 /* Check against plural/non plural based on count. */ 257 /* Check against plural/non plural based on count. */
255 else if (count > 1 && !strcasecmp (cp, op->name_pl)) 258 else if (count > 1 && !strcasecmp (cp, op->name_pl))
256 retval = 6; 259 retval = 6;
257 else if (count == 1 && !strcasecmp (op->name, cp)) 260 else if (count == 1 && !strcasecmp (op->name, cp))
258 retval = 6; 261 retval = 6;
259 /* base name matched - not bad */ 262 /* base name matched - not bad */
260 else if (strcasecmp (cp, op->name) == 0 && !count) 263 else if (strcasecmp (cp, op->name) == 0 && !count)
261 retval = 4; 264 retval = 4;
262 /* Check for partial custom name, but give a real low priority */ 265 /* Check for partial custom name, but give a real low priority */
263 else if (op->custom_name && strstr (op->custom_name, cp)) 266 else if (op->custom_name.contains (cp))
264 retval = 3; 267 retval = 3;
265 268
266 if (retval) 269 if (retval)
267 { 270 {
268 if (pl->type == PLAYER) 271 if (pl->type == PLAYER)
… …
440 return new_head; 443 return new_head;
441 } 444 }
442 445
443fail: 446fail:
444 for (auto (p, parts.begin ()); p != parts.end (); ++p) 447 for (auto (p, parts.begin ()); p != parts.end (); ++p)
445 (*p)->destroy (true); 448 (*p)->destroy ();
446 449
447 return 0; 450 return 0;
448} 451}
449 452
450void 453void
… …
510 513
511 if (at->refcnt_cnt () > 1) // all arches have ONE refcount from their object 514 if (at->refcnt_cnt () > 1) // all arches have ONE refcount from their object
512 ++idx; 515 ++idx;
513 else 516 else
514 { 517 {
515 LOG (llevDebug, "garbage collect arch %s", at->debug_desc ()); 518 LOG (llevDebug, "garbage collect arch %s", &at->archname);
516 assert (at->arch == at); // verify that refcnt == 1 is truely valid 519 assert (at->arch == at); // verify that refcnt == 1 is truly valid
517 allarch.erase (idx); 520 allarch.erase (idx);
521
522 // break chain
523 for (object *op = at->head_ (); op; )
524 {
525 object *next = op->more;
526 op->head = 0;
527 op->more = 0;
528 op = next;
529 }
530
531 at->destroy ();
518 at->arch = 0; 532 at->arch = 0;
519 at->more = 0;
520 at->destroy ();
521 } 533 }
522 } 534 }
523 while (--cnt); 535 while (--cnt);
524} 536}
525 537
526/*
527 * Creates and returns a new object which is a copy of the given archetype.
528 * This function returns NULL on failure.
529 */
530object * 538object *
531arch_to_object (archetype *at) 539archetype::instance ()
532{ 540{
533 if (!at)
534 {
535 LOG (llevError, "Couldn't find archetype.\n");
536 return 0;
537 }
538
539 object *op = at->clone (); 541 object *op = clone ();
540 op->arch = at;
541 op->instantiate (); 542 op->instantiate ();
542
543 return op; 543 return op;
544}
545
546object *
547archetype::instance ()
548{
549 return arch_to_object (this);
550} 544}
551 545
552/* 546/*
553 * Creates an object. This function is called by get_archetype() 547 * Creates an object. This function is called by get_archetype()
554 * if it fails to find the appropriate archetype. 548 * if it fails to find the appropriate archetype.
… …
561 LOG (llevError | logBacktrace, "FATAL: creating singularity for '%s'.\n", name); 555 LOG (llevError | logBacktrace, "FATAL: creating singularity for '%s'.\n", name);
562 556
563 if (!strcmp (name, "bug")) 557 if (!strcmp (name, "bug"))
564 abort (); 558 abort ();
565 559
566 char buf[MAX_BUF];
567 sprintf (buf, "bug, please report (%s)", name);
568
569 object *op = get_archetype ("bug"); 560 object *op = archetype::get (shstr_bug);
570 op->name = op->name_pl = buf; 561 op->name = op->name_pl = format ("bug, please report (missing archetype %s)", name);
571 562
572 return op; 563 return op;
573} 564}
574 565
575/* 566/*
… …
577 * object containing a copy of the archetype. 568 * object containing a copy of the archetype.
578 */ 569 */
579object * 570object *
580get_archetype (const char *name) 571get_archetype (const char *name)
581{ 572{
573 return archetype::get (name);
574}
575
576object *
577archetype::get (const char *name)
578{
582 archetype *at = archetype::find (name); 579 archetype *at = find (name);
583 580
584 if (!at) 581 if (!at)
585 return create_singularity (name); 582 return create_singularity (name);
586 583
587 return arch_to_object (at); 584 return at->instance ();
588}
589
590object *
591archetype::get (const char *name)
592{
593 return get_archetype (name);
594} 585}
595 586
596/* 587/*
597 * Returns the first archetype using the given type. 588 * Returns the first archetype using the given type.
598 * Used in treasure-generation. 589 * Used in treasure-generation.
… …
613 * Used in treasure-generation. 604 * Used in treasure-generation.
614 */ 605 */
615object * 606object *
616clone_arch (int type) 607clone_arch (int type)
617{ 608{
618 archetype *at; 609 archetype *at = type_to_archetype (type);
619 610
620 if ((at = type_to_archetype (type)) == NULL) 611 if (!at)
621 { 612 {
622 LOG (llevError, "Can't clone archetype %d\n", type); 613 LOG (llevError, "Can't clone archetype %d\n", type);
623 return 0; 614 return 0;
624 } 615 }
625 616
626 object *op = at->clone (); 617 return at->instance ();
627 op->instantiate ();
628 return op;
629} 618}
630 619
631/* 620/*
632 * member: make instance from class 621 * member: make instance from class
633 */ 622 */
… …
636{ 625{
637 object *op, *prev = 0, *head = 0; 626 object *op, *prev = 0, *head = 0;
638 627
639 while (at) 628 while (at)
640 { 629 {
641 op = arch_to_object (at); 630 op = at->instance ();
642 631
643 op->x = at->x; 632 op->x = at->x;
644 op->y = at->y; 633 op->y = at->y;
645 634
646 if (head) 635 if (head)

Diff Legend

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