--- deliantra/server/include/object.h	2006/12/06 13:59:01	1.47
+++ deliantra/server/include/object.h	2006/12/13 03:29:45	1.52
@@ -80,7 +80,7 @@
 
 /* However, if you're keeping a pointer of some sort, you probably
  * don't just want it copied, so you'll need to add to common/object.C,
- * e.g. copy_object.
+ * e.g. ->copy_to ()
  */
 
 typedef refptr<object> object_ptr;
@@ -90,20 +90,21 @@
 ACC_CLASS (object)
 struct object_keep : refcounted
 {
+  /* These variables are not changed by ->copy_to */
+
   tag_t ACC (RW, count);	/* Generation count for this object */
   UUID ACC (RW, uuid);          // Unique Identifier, survives saves etc.
 
-  /* These variables are not changed by copy_object() */
   player *ACC (RW, contr);	/* Pointer to the player which control this object */
   object *ACC (RW, next);	/* Pointer to the next object in the free/used list */
   object *ACC (RW, prev);	/* Pointer to the previous object in the free/used list */
   object *ACC (RW, active_next);/* Next & previous object in the 'active' */
   object *ACC (RW, active_prev);/* List.  This is used in process_events */
-  /* so that the entire object list does not */
-  /* need to be gone through. */
+                                /* so that the entire object list does not */
+                                /* need to be gone through. */
   object *ACC (RW, below);	/* Pointer to the object stacked below this one */
   object *ACC (RW, above);	/* Pointer to the object stacked above this one */
-  /* Note: stacked in the *same* environment */
+                                /* Note: stacked in the *same* environment */
   object *inv;			/* Pointer to the first object in the inventory */
   object *ACC (RW, container);	/* Current container being used.  I think this
 				 * is only used by the player right now.
@@ -112,7 +113,7 @@
 				 * This is typically the container that the object is in.
 				 */
   object *ACC (RW, more);	/* Pointer to the rest of a large body of objects */
-  object *head;	/* Points to the main object of a large body */ // NO ACC, perl semantics are different
+  object *head;			/* Points to the main object of a large body */ // NO ACC, perl semantics are different
   maptile *ACC (RW, map);	/* Pointer to the map in which this object is present */
 };
 
@@ -244,18 +245,29 @@
   static object *first;  // will be replaced by "objects"
 
   static object *create ();
+  void copy_to (object *dst);
+  object *clone (); // create + copy_to
   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);
+  static bool can_merge_slow (object *op1, object *op2);
+
+  // this is often used in time-critical code, so optimise
+  static bool can_merge (object *op1, object *op2)
+  {
+    return op1->value == op2->value
+        && op1->name  == op2->name
+        && can_merge_slow (op1, op2);
+  }
 
   void clear ();
-  void clone (object *destination);
 
   bool destroyed () { return QUERY_FLAG (this, FLAG_FREED); }
 
+  void set_owner (object *owner);
+
   void instantiate ()
   {
     if (!uuid.seq) // HACK
@@ -264,8 +276,6 @@
     attachable<object>::instantiate ();
   }
 
-  void set_owner (object *owner);
-
   // info must hold 256 * 3 bytes currently
   const char *debug_desc (char *info) const;
   const char *debug_desc () const;
@@ -315,29 +325,6 @@
   ~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
-#define get_owner(op) (op)->owner
-#define clear_object(op) (op)->clear ()
-
-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
 {				/* Used to link together several objects */
   object_ptr ob;
@@ -375,7 +362,7 @@
   struct archetype *ACC (RW, next);    		/* Next archetype in a linked list */
   struct archetype *ACC (RW, head);    		/* The main part of a linked object */
   struct archetype *ACC (RW, more);    		/* Next part of a linked object */
-  object ACC (RO, clone);	       		/* An object from which to do copy_object() */
+  object ACC (RO, clone);	       		/* An object from which to do ->copy_to () */
   uint32 ACC (RW, editable);	       		/* editable flags (mainly for editor) */
   sint8 ACC (RW, tail_x), ACC (RW, tail_y);	/* Where the lower right most portion of the object is
 						 * in comparison to the head.