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.101 by root, Fri Mar 26 01:04:43 2010 UTC vs.
Revision 1.106 by root, Thu May 6 22:35:41 2010 UTC

… …
212 /* All is a very generic match - low match value */ 212 /* All is a very generic match - low match value */
213 if (!strcmp (cp, "all")) 213 if (!strcmp (cp, "all"))
214 return 1; 214 return 1;
215 215
216 /* unpaid is a little more specific */ 216 /* unpaid is a little more specific */
217 if (!strcmp (cp, "unpaid") && QUERY_FLAG (op, FLAG_UNPAID)) 217 if (!strcmp (cp, "unpaid") && op->flag [FLAG_UNPAID])
218 return 2; 218 return 2;
219 219
220 if (!strcmp (cp, "cursed") && QUERY_FLAG (op, FLAG_KNOWN_CURSED) && (QUERY_FLAG (op, FLAG_CURSED) || QUERY_FLAG (op, FLAG_DAMNED))) 220 if (!strcmp (cp, "cursed") && op->flag [FLAG_KNOWN_CURSED] && (op->flag [FLAG_CURSED] || op->flag [FLAG_DAMNED]))
221 return 2; 221 return 2;
222 222
223 if (!strcmp (cp, "unlocked") && !QUERY_FLAG (op, FLAG_INV_LOCKED)) 223 if (!strcmp (cp, "unlocked") && !op->flag [FLAG_INV_LOCKED])
224 return 2; 224 return 2;
225 225
226 /* Allow for things like '100 arrows' */ 226 /* Allow for things like '100 arrows' */
227 if ((count = atoi (cp)) != 0) 227 if ((count = atoi (cp)) != 0)
228 { 228 {
… …
299 return 0; 299 return 0;
300} 300}
301 301
302//-GPL 302//-GPL
303 303
304void
305archetype::do_delete ()
306{
307 delete this;
308}
309
304archetype::archetype (const char *name) 310archetype::archetype (const char *name)
305{ 311{
306 arch = this; 312 arch = this;
307 this->archname = this->name = this->name_pl = name; 313 this->archname = this->name = this->name_pl = name;
308} 314}
… …
351} 357}
352 358
353void 359void
354archetype::post_load_check () 360archetype::post_load_check ()
355{ 361{
362 assert (("obj_original MUST NOT be set for archetypes", !flag [FLAG_OBJ_ORIGINAL]));
363
364 if (type == SKILL)
365 add_skill_archetype (this);
366
356 object::post_load_check (); 367 object::post_load_check ();
357
358 assert (("obj_original MUST NOT be set for archetypes", !flag [FLAG_OBJ_ORIGINAL]));
359} 368}
360 369
361archetype * 370archetype *
362archetype::read (object_thawer &f) 371archetype::read (object_thawer &f)
363{ 372{
… …
374 f.next (); 383 f.next ();
375 384
376#if 0 385#if 0
377 // implementing it here in the server does neither allow multiple inheritence 386 // implementing it here in the server does neither allow multiple inheritence
378 // nor does it cleanly "just override". it would allow use in map files, though, 387 // nor does it cleanly "just override". it would allow use in map files, though,
379 // and other resource files dynamically laoded (as opposed to being preprocessed). 388 // and other resource files dynamically loaded (as opposed to being preprocessed).
380 // not that any of this is relevant as of yet... 389 // not that any of this is relevant as of yet...
381 if (f.kw == KW_inherit) 390 if (f.kw == KW_inherit)
382 { 391 {
383 if (archetype *at = find (f.get_str ())) 392 if (archetype *at = find (f.get_str ()))
384 *op = at->clone; 393 *op = at->clone;
… …
540 549
541 if (at->refcnt_cnt () > 1) // all arches have ONE refcount from their object 550 if (at->refcnt_cnt () > 1) // all arches have ONE refcount from their object
542 ++idx; 551 ++idx;
543 else 552 else
544 { 553 {
545 LOG (llevDebug, "garbage collect arch %s", &at->archname); 554 //LOG (llevDebug, "garbage collect arch %s", &at->archname);
546 assert (at->arch == at); // verify that refcnt == 1 is truly valid 555 assert (at->arch == at); // verify that refcnt == 1 is truly valid
547 allarch.erase (idx); 556 allarch.erase (idx);
548 557
549 // break chain 558 // break chain
550 for (object *op = at->head_ (); op; ) 559 for (object *op = at->head_ (); op; )

Diff Legend

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