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.93 by root, Fri Nov 6 12:27:05 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
57
58/*
59 * Creates an object. This function is called by get_archetype()
60 * if it fails to find the appropriate archetype.
61 * Thus get_archetype() will be guaranteed to always return
62 * an object, and never NULL.
63 */
64object *
65create_singularity (const char *name)
66{
67 LOG (llevError | logBacktrace, "FATAL: creating singularity for '%s'.\n", name);
68
69 if (!strcmp (name, "bug"))
70 abort ();
71
72 object *op = archetype::get (shstr_bug);
73 op->name = op->name_pl = format ("bug, please report (missing archetype %s)", name);
74
75 return op;
76}
54 77
55/** 78/**
56 * GROS - This function retrieves an archetype given the name that appears 79 * GROS - This function retrieves an archetype given the name that appears
57 * during the game (for example, "writing pen" instead of "stylus"). 80 * 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. 81 * It does not use the hashtable system, but browse the whole archlist each time.
… …
102{ 125{
103 shstr_cmp skill_cmp (skill); 126 shstr_cmp skill_cmp (skill);
104 127
105 for_all_archetypes (at) 128 for_all_archetypes (at)
106 if (at->skill == skill_cmp && (type == -1 || type == at->type)) 129 if (at->skill == skill_cmp && (type == -1 || type == at->type))
107 return arch_to_object (at); 130 return at->instance ();
108 131
109 return 0; 132 return 0;
110} 133}
111 134
112/* similiar to above - this returns the first archetype 135/* similiar to above - this returns the first archetype
… …
133 * - name: The name we're searching for (ex: "writing pen"); 156 * - name: The name we're searching for (ex: "writing pen");
134 * Return value: 157 * Return value:
135 * - a corresponding object if found; a singularity object if not found. 158 * - 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 159 * 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 160 * 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, 161 * doesn't allocate it each time - not that this function is used much,
139 * but it otherwise had a big memory leak. 162 * but it otherwise had a big memory leak.
140 */ 163 */
141object * 164object *
142get_archetype_by_object_name (const char *name) 165get_archetype_by_object_name (const char *name)
143{ 166{
144 char tmpname[MAX_BUF]; 167 char tmpname[MAX_BUF];
145 int i;
146 168
147 assign (tmpname, name); 169 assign (tmpname, name);
148 170
149 for (i = strlen (tmpname); i > 0; i--) 171 for (int i = strlen (tmpname); i > 0; i--)
150 { 172 {
151 tmpname[i] = 0; 173 tmpname[i] = 0;
152 174
153 if (archetype *at = find_archetype_by_object_name (tmpname)) 175 if (archetype *at = find_archetype_by_object_name (tmpname))
154 return arch_to_object (at); 176 return at->instance ();
155 } 177 }
156 178
157 return create_singularity (name); 179 return create_singularity (name);
158} 180}
159 181
… …
193 return 1; 215 return 1;
194 216
195 /* unpaid is a little more specific */ 217 /* unpaid is a little more specific */
196 if (!strcmp (cp, "unpaid") && QUERY_FLAG (op, FLAG_UNPAID)) 218 if (!strcmp (cp, "unpaid") && QUERY_FLAG (op, FLAG_UNPAID))
197 return 2; 219 return 2;
220
198 if (!strcmp (cp, "cursed") && QUERY_FLAG (op, FLAG_KNOWN_CURSED) && (QUERY_FLAG (op, FLAG_CURSED) || QUERY_FLAG (op, FLAG_DAMNED))) 221 if (!strcmp (cp, "cursed") && QUERY_FLAG (op, FLAG_KNOWN_CURSED) && (QUERY_FLAG (op, FLAG_CURSED) || QUERY_FLAG (op, FLAG_DAMNED)))
199 return 2; 222 return 2;
200 223
201 if (!strcmp (cp, "unlocked") && !QUERY_FLAG (op, FLAG_INV_LOCKED)) 224 if (!strcmp (cp, "unlocked") && !QUERY_FLAG (op, FLAG_INV_LOCKED))
202 return 2; 225 return 2;
… …
224 * is because of the 'else' handling - we don't want to match on 247 * 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 248 * 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 249 * later. So keep it in descending order here, so we try for the best
227 * match first, and work downward. 250 * match first, and work downward.
228 */ 251 */
252 const char *qbn0, *qbn1, *qsn; // query base name/short name caches
253
229 if (!strcasecmp (cp, query_name (op))) 254 if (!strcasecmp (cp, query_name (op)))
230 retval = 20; 255 retval = 20;
231 else if (!strcasecmp (cp, query_short_name (op))) 256 else if (!strcasecmp (cp, qsn = query_short_name (op)))
232 retval = 18; 257 retval = 18;
233 else if (!strcasecmp (cp, query_base_name (op, 0))) 258 else if (!strcasecmp (cp, qbn0 = query_base_name (op, 0)))
234 retval = 16; 259 retval = 16;
235 else if (!strcasecmp (cp, query_base_name (op, 1))) 260 else if (!strcasecmp (cp, qbn1 = query_base_name (op, 1)))
236 retval = 16; 261 retval = 16;
237 else if (op->custom_name && !strcasecmp (cp, op->custom_name)) 262 else if (op->custom_name && !strcasecmp (cp, op->custom_name))
238 retval = 15; 263 retval = 15;
239 else if (!strncasecmp (cp, query_base_name (op, 0), strlen (cp))) 264 else if (!strncasecmp (cp, qbn0, strlen (cp)))
240 retval = 14; 265 retval = 14;
241 else if (!strncasecmp (cp, query_base_name (op, 1), strlen (cp))) 266 else if (!strncasecmp (cp, qbn1, strlen (cp)))
242 retval = 14; 267 retval = 14;
243 /* Do substring checks, so things like 'Str+1' will match. 268 /* Do substring checks, so things like 'Str+1' will match.
244 * retval of these should perhaps be lower - they are lower 269 * retval of these should perhaps be lower - they are lower
245 * then the specific strcasecmp aboves, but still higher than 270 * then the specific strcasecmp aboves, but still higher than
246 * some other match criteria. 271 * some other match criteria.
247 */ 272 */
248 else if (strstr (query_base_name (op, 1), cp)) 273 else if (strstr (qbn1, cp))
249 retval = 12; 274 retval = 12;
250 else if (strstr (query_base_name (op, 0), cp)) 275 else if (strstr (qbn0, cp))
251 retval = 12; 276 retval = 12;
252 else if (strstr (query_short_name (op), cp)) 277 else if (strstr (qsn, cp))
253 retval = 12; 278 retval = 12;
254 /* Check against plural/non plural based on count. */ 279 /* Check against plural/non plural based on count. */
255 else if (count > 1 && !strcasecmp (cp, op->name_pl)) 280 else if (count > 1 && !strcasecmp (cp, op->name_pl))
256 retval = 6; 281 retval = 6;
257 else if (count == 1 && !strcasecmp (op->name, cp)) 282 else if (count == 1 && !strcasecmp (op->name, cp))
258 retval = 6; 283 retval = 6;
259 /* base name matched - not bad */ 284 /* base name matched - not bad */
260 else if (strcasecmp (cp, op->name) == 0 && !count) 285 else if (strcasecmp (cp, op->name) == 0 && !count)
261 retval = 4; 286 retval = 4;
262 /* Check for partial custom name, but give a real low priority */ 287 /* Check for partial custom name, but give a real low priority */
263 else if (op->custom_name && strstr (op->custom_name, cp)) 288 else if (op->custom_name.contains (cp))
264 retval = 3; 289 retval = 3;
265 290
266 if (retval) 291 if (retval)
267 { 292 {
268 if (pl->type == PLAYER) 293 if (pl->type == PLAYER)
… …
272 } 297 }
273 } 298 }
274 299
275 return 0; 300 return 0;
276} 301}
302
303//-GPL
277 304
278archetype::archetype (const char *name) 305archetype::archetype (const char *name)
279{ 306{
280 arch = this; 307 arch = this;
281 this->archname = this->name = this->name_pl = name; 308 this->archname = this->name = this->name_pl = name;
… …
440 return new_head; 467 return new_head;
441 } 468 }
442 469
443fail: 470fail:
444 for (auto (p, parts.begin ()); p != parts.end (); ++p) 471 for (auto (p, parts.begin ()); p != parts.end (); ++p)
445 (*p)->destroy (true); 472 (*p)->destroy ();
446 473
447 return 0; 474 return 0;
448} 475}
449 476
450void 477void
… …
510 537
511 if (at->refcnt_cnt () > 1) // all arches have ONE refcount from their object 538 if (at->refcnt_cnt () > 1) // all arches have ONE refcount from their object
512 ++idx; 539 ++idx;
513 else 540 else
514 { 541 {
515 LOG (llevDebug, "garbage collect arch %s", at->debug_desc ()); 542 LOG (llevDebug, "garbage collect arch %s", &at->archname);
516 assert (at->arch == at); // verify that refcnt == 1 is truely valid 543 assert (at->arch == at); // verify that refcnt == 1 is truly valid
517 allarch.erase (idx); 544 allarch.erase (idx);
545
546 // break chain
547 for (object *op = at->head_ (); op; )
548 {
549 object *next = op->more;
550 op->head = 0;
551 op->more = 0;
552 op = next;
553 }
554
555 at->destroy ();
518 at->arch = 0; 556 at->arch = 0;
519 at->more = 0;
520 at->destroy ();
521 } 557 }
522 } 558 }
523 while (--cnt); 559 while (--cnt);
524} 560}
525 561
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 * 562object *
531arch_to_object (archetype *at) 563archetype::instance ()
532{ 564{
533 if (!at)
534 {
535 LOG (llevError, "Couldn't find archetype.\n");
536 return 0;
537 }
538
539 object *op = at->clone (); 565 object *op = clone ();
540 op->arch = at;
541 op->instantiate (); 566 op->instantiate ();
542
543 return op; 567 return op;
544} 568}
545 569
546object * 570//+GPL
547archetype::instance ()
548{
549 return arch_to_object (this);
550}
551
552/*
553 * Creates an object. This function is called by get_archetype()
554 * if it fails to find the appropriate archetype.
555 * Thus get_archetype() will be guaranteed to always return
556 * an object, and never NULL.
557 */
558object *
559create_singularity (const char *name)
560{
561 LOG (llevError | logBacktrace, "FATAL: creating singularity for '%s'.\n", name);
562
563 if (!strcmp (name, "bug"))
564 abort ();
565
566 char buf[MAX_BUF];
567 sprintf (buf, "bug, please report (%s)", name);
568
569 object *op = get_archetype ("bug");
570 op->name = op->name_pl = buf;
571
572 return op;
573}
574 571
575/* 572/*
576 * Finds which archetype matches the given name, and returns a new 573 * Finds which archetype matches the given name, and returns a new
577 * object containing a copy of the archetype. 574 * object containing a copy of the archetype.
578 */ 575 */
579object * 576object *
580get_archetype (const char *name) 577get_archetype (const char *name)
581{ 578{
579 return archetype::get (name);
580}
581
582object *
583archetype::get (const char *name)
584{
582 archetype *at = archetype::find (name); 585 archetype *at = find (name);
583 586
584 if (!at) 587 if (!at)
585 return create_singularity (name); 588 return create_singularity (name);
586 589
587 return arch_to_object (at); 590 return at->instance ();
588}
589
590object *
591archetype::get (const char *name)
592{
593 return get_archetype (name);
594} 591}
595 592
596/* 593/*
597 * Returns the first archetype using the given type. 594 * Returns the first archetype using the given type.
598 * Used in treasure-generation. 595 * Used in treasure-generation.
… …
613 * Used in treasure-generation. 610 * Used in treasure-generation.
614 */ 611 */
615object * 612object *
616clone_arch (int type) 613clone_arch (int type)
617{ 614{
618 archetype *at; 615 archetype *at = type_to_archetype (type);
619 616
620 if ((at = type_to_archetype (type)) == NULL) 617 if (!at)
621 { 618 {
622 LOG (llevError, "Can't clone archetype %d\n", type); 619 LOG (llevError, "Can't clone archetype %d\n", type);
623 return 0; 620 return 0;
624 } 621 }
625 622
626 object *op = at->clone (); 623 return at->instance ();
627 op->instantiate ();
628 return op;
629} 624}
630 625
631/* 626/*
632 * member: make instance from class 627 * member: make instance from class
633 */ 628 */
… …
636{ 631{
637 object *op, *prev = 0, *head = 0; 632 object *op, *prev = 0, *head = 0;
638 633
639 while (at) 634 while (at)
640 { 635 {
641 op = arch_to_object (at); 636 op = at->instance ();
642 637
643 op->x = at->x; 638 op->x = at->x;
644 op->y = at->y; 639 op->y = at->y;
645 640
646 if (head) 641 if (head)
… …
654 } 649 }
655 650
656 return head; 651 return head;
657} 652}
658 653
654//-GPL
655

Diff Legend

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