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

Comparing deliantra/server/include/object.h (file contents):
Revision 1.119 by root, Sat May 12 13:27:37 2007 UTC vs.
Revision 1.121 by root, Mon May 14 19:08:26 2007 UTC

   body_foot,
   body_hand,
   body_wrist,
   body_waist,
   NUM_BODY_LOCATIONS
+};
+enum slottype_t
+{
+  slot_none,
+  slot_combat,
+  slot_ranged,
 };
 /* See common/item.c */
 typedef struct Body_Locations
   bool parse_kv (object_thawer &f); // parse kv pairs, (ab-)used by archetypes, which should not exist at all
   void post_load_check ();          // do some adjustments after parsing
   static object *read (object_thawer &f, maptile *map = 0); // map argument due to toal design bogosity, must go.
   bool write (object_freezer &f);
+  MTH int slottype () const;
   MTH static object *create ();
   object &operator =(const object &src);
   MTH void copy_to (object *dst);
   MTH object *clone (); // create + copy_to
   void do_destroy ();
         && can_merge_slow (op1, op2);
   }
   MTH void set_owner (object *owner);
   MTH void set_speed (float speed);
-  MTH void set_weapon (object *ob);
+  MTH bool change_weapon (object *ob);
   MTH void open_container (object *new_container);
   MTH void close_container ()
   {
     open_container (0);

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