--- deliantra/server/include/cfperl.h	2007/07/11 16:55:18	1.82
+++ deliantra/server/include/cfperl.h	2007/07/21 18:01:26	1.84
@@ -91,6 +91,7 @@
 void cfperl_cleanup (int make_core);
 void cfperl_make_book (object *book, int level);
 void cfperl_send_msg (client *ns, int color, const char *type, const char *msg);
+int cfperl_can_merge (object *ob1, object *ob2);
 
 //////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
 
@@ -211,8 +212,6 @@
   {
   }
 
-  virtual ~attachable ();
-
   // set a custom key to the given value, or delete it if value = 0
   void set_key (const char *key, const char *value = 0);
 
@@ -235,6 +234,9 @@
 
   // the method that does the real destroy work
   virtual void do_destroy ();
+
+  // destructor is protected, should not be called by anybody
+  virtual ~attachable ();
 };
 
 // the global object is a pseudo object that cares for the global events