[ViewVC] Diff of: cvs/deliantra/server/include/object.h

Comparing deliantra/server/include/object.h (file contents):
Revision 1.221 by root, Wed Nov 11 23:27:57 2009 UTC vs.
Revision 1.223 by root, Sun Nov 29 17:41:07 2009 UTC

   MTH bool is_arrow  () const { return type == ARROW
                                        || (type == SPELL_EFFECT
                                            && (subtype == SP_BULLET || subtype == SP_MAGIC_MISSILE)); }
   MTH bool is_range  () const { return type == BOW || type == ROD || type == WAND || type == HORN; }
-  MTH bool has_active_speed () const { return fabs (speed) >= MIN_ACTIVE_SPEED; }
+  MTH bool has_active_speed () const { return speed >= MIN_ACTIVE_SPEED; }
   // temporary: wether the object can be saved in a map file
   // contr => is a player
   // head  => only save head of a multitile object
   // owner => can not reference owner yet
   // support for archetype loading
   static archetype *read (object_thawer &f);
   MTH static void commit_load (); // commit any objects loaded, resolves cyclic dependencies and more
   static void postpone_arch_ref (arch_ptr &ref, const_utf8_string other_arch); /* postpone  other_arch reference */
 };
-// compatbiility, remove once replaced by ->instance
-inline object *
-arch_to_object (archetype *at)
-{
-  return at->instance ();
-}
 inline void
 object_freezer::put (const keyword_string k, archetype *v)
 {
   if (expect_true (v))

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