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

Comparing deliantra/server/include/object.h (file contents):
Revision 1.46 by root, Sun Dec 3 01:06:37 2006 UTC vs.
Revision 1.47 by root, Wed Dec 6 13:59:01 2006 UTC

   static vector objects; // not used yet, use first->next->...
   static object *first;  // will be replaced by "objects"
   static object *create ();
   void destroy (bool destroy_inventory = false);
+  void remove ();
+  object *insert (object *item); // insert into inventory
   static void free_mortals ();
   static bool can_merge (object *op1, object *op2);
   void clear ();
   object ();
   ~object ();
 };
+// compatibility functions/macros
 #define get_object() object::create ()
 #define free_object(op) (op)->destroy (0)
 #define free_object2(op, free_inv) (op)->destroy (free_inv)
 #define clear_owner(op) (op)->owner = 0
 #define copy_owner(op,other) (op)->owner = (other)->owner
 static inline void
 set_owner (object *op, object *owner)
 {
   op->set_owner (owner);
+}
+static inline void
+remove_ob (object *op)
+{
+  op->remove ();
 }
 #define CAN_MERGE(op1,op2) ((op1)->value == (op2)->value && (op1)->name == (op2)->name && object::can_merge ((op1), (op2)))
 typedef struct oblnk

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