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.92 by root, Thu Nov 5 15:43:21 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>
… …
49 50
50// the vector of other_arch references to be resolved 51// the vector of other_arch references to be resolved
51static std::vector< std::pair<arch_ptr *, shstr> > postponed_arch_ref; 52static std::vector< std::pair<arch_ptr *, shstr> > postponed_arch_ref;
52// the vector of loaded but not yet committed archetypes 53// the vector of loaded but not yet committed archetypes
53static std::vector<archetype *> postponed_arch; 54static std::vector<archetype *> postponed_arch;
55
56//+GPL
54 57
55/** 58/**
56 * GROS - This function retrieves an archetype given the name that appears 59 * GROS - This function retrieves an archetype given the name that appears
57 * during the game (for example, "writing pen" instead of "stylus"). 60 * during the game (for example, "writing pen" instead of "stylus").
58 * It does not use the hashtable system, but browse the whole archlist each time. 61 * It does not use the hashtable system, but browse the whole archlist each time.
… …
102{ 105{
103 shstr_cmp skill_cmp (skill); 106 shstr_cmp skill_cmp (skill);
104 107
105 for_all_archetypes (at) 108 for_all_archetypes (at)
106 if (at->skill == skill_cmp && (type == -1 || type == at->type)) 109 if (at->skill == skill_cmp && (type == -1 || type == at->type))
107 return arch_to_object (at); 110 return at->instance ();
108 111
109 return 0; 112 return 0;
110} 113}
111 114
112/* similiar to above - this returns the first archetype 115/* similiar to above - this returns the first archetype
… …
140 */ 143 */
141object * 144object *
142get_archetype_by_object_name (const char *name) 145get_archetype_by_object_name (const char *name)
143{ 146{
144 char tmpname[MAX_BUF]; 147 char tmpname[MAX_BUF];
145 int i;
146 148
147 assign (tmpname, name); 149 assign (tmpname, name);
148 150
149 for (i = strlen (tmpname); i > 0; i--) 151 for (int i = strlen (tmpname); i > 0; i--)
150 { 152 {
151 tmpname[i] = 0; 153 tmpname[i] = 0;
152 154
153 if (archetype *at = find_archetype_by_object_name (tmpname)) 155 if (archetype *at = find_archetype_by_object_name (tmpname))
154 return arch_to_object (at); 156 return at->instance ();
155 } 157 }
156 158
157 return create_singularity (name); 159 return create_singularity (name);
158} 160}
159 161
… …
193 return 1; 195 return 1;
194 196
195 /* unpaid is a little more specific */ 197 /* unpaid is a little more specific */
196 if (!strcmp (cp, "unpaid") && QUERY_FLAG (op, FLAG_UNPAID)) 198 if (!strcmp (cp, "unpaid") && QUERY_FLAG (op, FLAG_UNPAID))
197 return 2; 199 return 2;
200
198 if (!strcmp (cp, "cursed") && QUERY_FLAG (op, FLAG_KNOWN_CURSED) && (QUERY_FLAG (op, FLAG_CURSED) || QUERY_FLAG (op, FLAG_DAMNED))) 201 if (!strcmp (cp, "cursed") && QUERY_FLAG (op, FLAG_KNOWN_CURSED) && (QUERY_FLAG (op, FLAG_CURSED) || QUERY_FLAG (op, FLAG_DAMNED)))
199 return 2; 202 return 2;
200 203
201 if (!strcmp (cp, "unlocked") && !QUERY_FLAG (op, FLAG_INV_LOCKED)) 204 if (!strcmp (cp, "unlocked") && !QUERY_FLAG (op, FLAG_INV_LOCKED))
202 return 2; 205 return 2;
… …
224 * is because of the 'else' handling - we don't want to match on 227 * 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 228 * 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 229 * later. So keep it in descending order here, so we try for the best
227 * match first, and work downward. 230 * match first, and work downward.
228 */ 231 */
232 const char *qbn0, *qbn1, *qsn; // query base name/short name caches
233
229 if (!strcasecmp (cp, query_name (op))) 234 if (!strcasecmp (cp, query_name (op)))
230 retval = 20; 235 retval = 20;
231 else if (!strcasecmp (cp, query_short_name (op))) 236 else if (!strcasecmp (cp, qsn = query_short_name (op)))
232 retval = 18; 237 retval = 18;
233 else if (!strcasecmp (cp, query_base_name (op, 0))) 238 else if (!strcasecmp (cp, qbn0 = query_base_name (op, 0)))
234 retval = 16; 239 retval = 16;
235 else if (!strcasecmp (cp, query_base_name (op, 1))) 240 else if (!strcasecmp (cp, qbn1 = query_base_name (op, 1)))
236 retval = 16; 241 retval = 16;
237 else if (op->custom_name && !strcasecmp (cp, op->custom_name)) 242 else if (op->custom_name && !strcasecmp (cp, op->custom_name))
238 retval = 15; 243 retval = 15;
239 else if (!strncasecmp (cp, query_base_name (op, 0), strlen (cp))) 244 else if (!strncasecmp (cp, qbn0, strlen (cp)))
240 retval = 14; 245 retval = 14;
241 else if (!strncasecmp (cp, query_base_name (op, 1), strlen (cp))) 246 else if (!strncasecmp (cp, qbn1, strlen (cp)))
242 retval = 14; 247 retval = 14;
243 /* Do substring checks, so things like 'Str+1' will match. 248 /* Do substring checks, so things like 'Str+1' will match.
244 * retval of these should perhaps be lower - they are lower 249 * retval of these should perhaps be lower - they are lower
245 * then the specific strcasecmp aboves, but still higher than 250 * then the specific strcasecmp aboves, but still higher than
246 * some other match criteria. 251 * some other match criteria.
247 */ 252 */
248 else if (strstr (query_base_name (op, 1), cp)) 253 else if (strstr (qbn1, cp))
249 retval = 12; 254 retval = 12;
250 else if (strstr (query_base_name (op, 0), cp)) 255 else if (strstr (qbn0, cp))
251 retval = 12; 256 retval = 12;
252 else if (strstr (query_short_name (op), cp)) 257 else if (strstr (qsn, cp))
253 retval = 12; 258 retval = 12;
254 /* Check against plural/non plural based on count. */ 259 /* Check against plural/non plural based on count. */
255 else if (count > 1 && !strcasecmp (cp, op->name_pl)) 260 else if (count > 1 && !strcasecmp (cp, op->name_pl))
256 retval = 6; 261 retval = 6;
257 else if (count == 1 && !strcasecmp (op->name, cp)) 262 else if (count == 1 && !strcasecmp (op->name, cp))
258 retval = 6; 263 retval = 6;
259 /* base name matched - not bad */ 264 /* base name matched - not bad */
260 else if (strcasecmp (cp, op->name) == 0 && !count) 265 else if (strcasecmp (cp, op->name) == 0 && !count)
261 retval = 4; 266 retval = 4;
262 /* Check for partial custom name, but give a real low priority */ 267 /* Check for partial custom name, but give a real low priority */
263 else if (op->custom_name && strstr (op->custom_name, cp)) 268 else if (op->custom_name.contains (cp))
264 retval = 3; 269 retval = 3;
265 270
266 if (retval) 271 if (retval)
267 { 272 {
268 if (pl->type == PLAYER) 273 if (pl->type == PLAYER)
… …
272 } 277 }
273 } 278 }
274 279
275 return 0; 280 return 0;
276} 281}
282
283//-GPL
277 284
278archetype::archetype (const char *name) 285archetype::archetype (const char *name)
279{ 286{
280 arch = this; 287 arch = this;
281 this->archname = this->name = this->name_pl = name; 288 this->archname = this->name = this->name_pl = name;
… …
440 return new_head; 447 return new_head;
441 } 448 }
442 449
443fail: 450fail:
444 for (auto (p, parts.begin ()); p != parts.end (); ++p) 451 for (auto (p, parts.begin ()); p != parts.end (); ++p)
445 (*p)->destroy (true); 452 (*p)->destroy ();
446 453
447 return 0; 454 return 0;
448} 455}
449 456
450void 457void
… …
510 517
511 if (at->refcnt_cnt () > 1) // all arches have ONE refcount from their object 518 if (at->refcnt_cnt () > 1) // all arches have ONE refcount from their object
512 ++idx; 519 ++idx;
513 else 520 else
514 { 521 {
515 LOG (llevDebug, "garbage collect arch %s", at->debug_desc ()); 522 LOG (llevDebug, "garbage collect arch %s", &at->archname);
516 assert (at->arch == at); // verify that refcnt == 1 is truly valid 523 assert (at->arch == at); // verify that refcnt == 1 is truly valid
517 allarch.erase (idx); 524 allarch.erase (idx);
518 525
519 // break chain 526 // break chain
520 for (object *op = at->head_ (); op; ) 527 for (object *op = at->head_ (); op; )
… …
530 } 537 }
531 } 538 }
532 while (--cnt); 539 while (--cnt);
533} 540}
534 541
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 * 542object *
540arch_to_object (archetype *at) 543archetype::instance ()
541{ 544{
542 if (!at)
543 {
544 LOG (llevError, "Couldn't find archetype.\n");
545 return 0;
546 }
547
548 object *op = at->clone (); 545 object *op = clone ();
549 op->arch = at;
550 op->instantiate (); 546 op->instantiate ();
551
552 return op; 547 return op;
553} 548}
554 549
555object * 550//+GPL
556archetype::instance ()
557{
558 return arch_to_object (this);
559}
560 551
561/* 552/*
562 * Creates an object. This function is called by get_archetype() 553 * Creates an object. This function is called by get_archetype()
563 * if it fails to find the appropriate archetype. 554 * if it fails to find the appropriate archetype.
564 * Thus get_archetype() will be guaranteed to always return 555 * Thus get_archetype() will be guaranteed to always return
… …
570 LOG (llevError | logBacktrace, "FATAL: creating singularity for '%s'.\n", name); 561 LOG (llevError | logBacktrace, "FATAL: creating singularity for '%s'.\n", name);
571 562
572 if (!strcmp (name, "bug")) 563 if (!strcmp (name, "bug"))
573 abort (); 564 abort ();
574 565
575 char buf[MAX_BUF];
576 sprintf (buf, "bug, please report (%s)", name);
577
578 object *op = get_archetype ("bug"); 566 object *op = archetype::get (shstr_bug);
579 op->name = op->name_pl = buf; 567 op->name = op->name_pl = format ("bug, please report (missing archetype %s)", name);
580 568
581 return op; 569 return op;
582} 570}
583 571
584/* 572/*
… …
586 * object containing a copy of the archetype. 574 * object containing a copy of the archetype.
587 */ 575 */
588object * 576object *
589get_archetype (const char *name) 577get_archetype (const char *name)
590{ 578{
579 return archetype::get (name);
580}
581
582object *
583archetype::get (const char *name)
584{
591 archetype *at = archetype::find (name); 585 archetype *at = find (name);
592 586
593 if (!at) 587 if (!at)
594 return create_singularity (name); 588 return create_singularity (name);
595 589
596 return arch_to_object (at); 590 return at->instance ();
597}
598
599object *
600archetype::get (const char *name)
601{
602 return get_archetype (name);
603} 591}
604 592
605/* 593/*
606 * Returns the first archetype using the given type. 594 * Returns the first archetype using the given type.
607 * Used in treasure-generation. 595 * Used in treasure-generation.
… …
622 * Used in treasure-generation. 610 * Used in treasure-generation.
623 */ 611 */
624object * 612object *
625clone_arch (int type) 613clone_arch (int type)
626{ 614{
627 archetype *at; 615 archetype *at = type_to_archetype (type);
628 616
629 if ((at = type_to_archetype (type)) == NULL) 617 if (!at)
630 { 618 {
631 LOG (llevError, "Can't clone archetype %d\n", type); 619 LOG (llevError, "Can't clone archetype %d\n", type);
632 return 0; 620 return 0;
633 } 621 }
634 622
635 object *op = at->clone (); 623 return at->instance ();
636 op->instantiate ();
637 return op;
638} 624}
639 625
640/* 626/*
641 * member: make instance from class 627 * member: make instance from class
642 */ 628 */
… …
645{ 631{
646 object *op, *prev = 0, *head = 0; 632 object *op, *prev = 0, *head = 0;
647 633
648 while (at) 634 while (at)
649 { 635 {
650 op = arch_to_object (at); 636 op = at->instance ();
651 637
652 op->x = at->x; 638 op->x = at->x;
653 op->y = at->y; 639 op->y = at->y;
654 640
655 if (head) 641 if (head)
… …
663 } 649 }
664 650
665 return head; 651 return head;
666} 652}
667 653
654//-GPL
655

Diff Legend

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