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.225 by root, Sat Jan 30 23:30:26 2010 UTC vs.
Revision 1.226 by root, Sun Mar 21 23:47:16 2010 UTC

808 MTH void post_load_check (); // do some adjustments after parsing 808 MTH void post_load_check (); // do some adjustments after parsing
809 809
810 object_vector_index ACC (RW, archid); // index in archvector 810 object_vector_index ACC (RW, archid); // index in archvector
811 shstr ACC (RW, archname); /* More definite name, like "generate_kobold" */ 811 shstr ACC (RW, archname); /* More definite name, like "generate_kobold" */
812 812
813 sint8 ACC (RW, min_x), ACC (RW, min_y); /* extents, compared to the head (min_x, min_y should be zero, but aren't...) */ 813 sint8 ACC (RW, max_x); /* extents, compared to the head (min_x, min_y should be zero, but aren't...) */
814 sint8 ACC (RW, max_x), ACC (RW, max_y);
815 814
816 // support for archetype loading 815 // support for archetype loading
817 static archetype *read (object_thawer &f); 816 static archetype *read (object_thawer &f);
818 MTH static void commit_load (); // commit any objects loaded, resolves cyclic dependencies and more 817 MTH static void commit_load (); // commit any objects loaded, resolves cyclic dependencies and more
819 static void postpone_arch_ref (arch_ptr &ref, const_utf8_string other_arch); /* postpone other_arch reference */ 818 static void postpone_arch_ref (arch_ptr &ref, const_utf8_string other_arch); /* postpone other_arch reference */
820}; 819};
821 820
822// returns whether the objetc is a dragon player, which are often specialcased 821// returns whether the object is a dragon player, which are often specialcased
823inline bool 822inline bool
824object::is_dragon () const 823object::is_dragon () const
825{ 824{
826 return arch->race == shstr_dragon && is_player (); 825 return arch->race == shstr_dragon && is_player ();
827} 826}

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines