--- deliantra/server/include/object.h	2006/09/19 22:05:55	1.41
+++ deliantra/server/include/object.h	2006/09/27 00:36:09	1.42
@@ -242,7 +242,7 @@
   static object *first;  // will be replaced by "objects"
 
   static object *create ();
-  void free (bool free_inventory = false);
+  void destroy (bool destroy_inventory = false);
 
   static void free_mortals ();
   static bool can_merge (object *op1, object *op2);
@@ -312,8 +312,8 @@
 };
 
 #define get_object() object::create ()
-#define free_object(op) (op)->free (0)
-#define free_object2(op, free_inv) (op)->free (free_inv)
+#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