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.220 by root, Tue Nov 10 05:05:22 2009 UTC vs.
Revision 1.221 by root, Wed Nov 11 23:27:57 2009 UTC

823{ 823{
824 return at->instance (); 824 return at->instance ();
825} 825}
826 826
827inline void 827inline void
828object_freezer::put (keyword k, archetype *v) 828object_freezer::put (const keyword_string k, archetype *v)
829{ 829{
830 put (k, v ? &v->archname : (const char *)0); 830 if (expect_true (v))
831 put (k, v->archname);
832 else
833 put (k);
831} 834}
832 835
833typedef object_vector<object, &object::index > objectvec; 836typedef object_vector<object, &object::index > objectvec;
834typedef object_vector<object, &object::active> activevec; 837typedef object_vector<object, &object::active> activevec;
835typedef object_vector<archetype, &archetype::archid> archvec; 838typedef object_vector<archetype, &archetype::archid> archvec;

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines