ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/deliantra/server/include/object.h
(Generate patch)

Comparing deliantra/server/include/object.h (file contents):
Revision 1.222 by root, Sun Nov 29 09:41:28 2009 UTC vs.
Revision 1.223 by root, Sun Nov 29 17:41:07 2009 UTC

814 // support for archetype loading 814 // support for archetype loading
815 static archetype *read (object_thawer &f); 815 static archetype *read (object_thawer &f);
816 MTH static void commit_load (); // commit any objects loaded, resolves cyclic dependencies and more 816 MTH static void commit_load (); // commit any objects loaded, resolves cyclic dependencies and more
817 static void postpone_arch_ref (arch_ptr &ref, const_utf8_string other_arch); /* postpone other_arch reference */ 817 static void postpone_arch_ref (arch_ptr &ref, const_utf8_string other_arch); /* postpone other_arch reference */
818}; 818};
819
820// compatbiility, remove once replaced by ->instance
821inline object *
822arch_to_object (archetype *at)
823{
824 return at->instance ();
825}
826 819
827inline void 820inline void
828object_freezer::put (const keyword_string k, archetype *v) 821object_freezer::put (const keyword_string k, archetype *v)
829{ 822{
830 if (expect_true (v)) 823 if (expect_true (v))

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines