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.104 by root, Mon Apr 12 05:22:37 2010 UTC vs.
Revision 1.108 by root, Sun May 1 16:58:15 2011 UTC

1/* 1/*
2 * This file is part of Deliantra, the Roguelike Realtime MMORPG. 2 * This file is part of Deliantra, the Roguelike Realtime MMORPG.
3 * 3 *
4 * Copyright (©) 2005,2006,2007,2008,2009,2010 Marc Alexander Lehmann / Robin Redeker / the Deliantra team 4 * Copyright (©) 2005,2006,2007,2008,2009,2010,2011 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
5 * Copyright (©) 2002 Mark Wedel & Crossfire Development Team 5 * Copyright (©) 2002 Mark Wedel & Crossfire Development Team
6 * Copyright (©) 1992 Frank Tore Johansen 6 * Copyright (©) 1992 Frank Tore Johansen
7 * 7 *
8 * Deliantra is free software: you can redistribute it and/or modify it under 8 * Deliantra is free software: you can redistribute it and/or modify it under
9 * the terms of the Affero GNU General Public License as published by the 9 * the terms of the Affero GNU General Public License as published by the
… …
53static std::vector<archetype *> postponed_arch; 53static std::vector<archetype *> postponed_arch;
54 54
55//+GPL 55//+GPL
56 56
57/* 57/*
58 * Creates an object. This function is called by get_archetype () 58 * Creates an object. This function is called by archetype::get ()
59 * if it fails to find the appropriate archetype. 59 * if it fails to find the appropriate archetype.
60 * Thus get_archetype() will be guaranteed to always return 60 * Thus archetype::get() will be guaranteed to always return
61 * an object, and never NULL. 61 * an object, and never NULL.
62 */ 62 */
63static object * 63static object *
64create_singularity (const char *name) 64create_singularity (const char *name)
65{ 65{
… …
357} 357}
358 358
359void 359void
360archetype::post_load_check () 360archetype::post_load_check ()
361{ 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
362 object::post_load_check (); 367 object::post_load_check ();
363
364 assert (("obj_original MUST NOT be set for archetypes", !flag [FLAG_OBJ_ORIGINAL]));
365} 368}
366 369
367archetype * 370archetype *
368archetype::read (object_thawer &f) 371archetype::read (object_thawer &f)
369{ 372{
… …
546 549
547 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
548 ++idx; 551 ++idx;
549 else 552 else
550 { 553 {
551 LOG (llevDebug, "garbage collect arch %s", &at->archname); 554 //LOG (llevDebug, "garbage collect arch %s", &at->archname);
552 assert (at->arch == at); // verify that refcnt == 1 is truly valid 555 assert (at->arch == at); // verify that refcnt == 1 is truly valid
553 allarch.erase (idx); 556 allarch.erase (idx);
554 557
555 // break chain 558 // break chain
556 for (object *op = at->head_ (); op; ) 559 for (object *op = at->head_ (); op; )
… …
581/* 584/*
582 * Finds which archetype matches the given name, and returns a new 585 * Finds which archetype matches the given name, and returns a new
583 * object containing a copy of the archetype. 586 * object containing a copy of the archetype.
584 */ 587 */
585object * 588object *
586get_archetype (const char *name)
587{
588 return archetype::get (name);
589}
590
591object *
592archetype::get (const char *name) 589archetype::get (const char *name)
593{ 590{
594 archetype *at = find (name); 591 archetype *at = find (name);
595 592
596 if (!at) 593 if (!at)

Diff Legend

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