--- deliantra/server/include/cfperl.h	2007/07/01 05:00:18	1.81
+++ deliantra/server/include/cfperl.h	2007/08/30 07:28:25	1.88
@@ -57,6 +57,7 @@
 #undef gethostbyname
 #undef ctime
 #undef strerror
+#undef _
 
 // same here, massive symbol spamming
 #undef do_open
@@ -71,6 +72,11 @@
 
 //////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
 
+#define _(msg)  (msg)
+#define N_(msg) (msg)
+
+//////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
+
 // some macros to simplify perl in-calls
 
 #define CHECK_ERROR			\
@@ -91,6 +97,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);
 
 //////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
 
@@ -155,7 +162,7 @@
 //////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
 
 INTERFACE_CLASS (attachable)
-struct attachable
+struct attachable : refcnt_base
 {
   static MGVTBL vtbl;
 
@@ -166,14 +173,9 @@
     F_DESTROYED   = 0x01,
     F_DEBUG_TRACE = 0x02,
   };
-
-  // object is delete'd after the refcount reaches 0
   int ACC (RW, flags);
-  mutable int ACC (RW, refcnt);
-
-  MTH void refcnt_inc () const { ++refcnt; }
-  MTH void refcnt_dec () const { --refcnt; }
 
+  // object is delete'd after the refcount reaches 0
   MTH int refcnt_cnt () const;
   // check wether the object has died and destroy
   MTH void refcnt_chk () { if (expect_false (refcnt <= 0)) do_check (); }
@@ -202,16 +204,27 @@
   void optimise ();   // possibly save some memory by destroying unneeded data
 
   attachable ()
-  : flags (0), refcnt (0), self (0), cb (0), attach (0)
+  : flags (0), self (0), cb (0), attach (0)
   {
   }
 
   attachable (const attachable &src)
-  : flags (0), refcnt (0), self (0), cb (0), attach (src.attach)
+  : flags (0), self (0), cb (0), attach (src.attach)
   {
   }
 
-  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, bool is_utf8 = 0);
+
+  void set_key_text (const char *key, const char *value = 0)
+  {
+    set_key (key, value, 1);
+  }
+
+  void set_key_data (const char *key, const char *value = 0)
+  {
+    set_key (key, value, 0);
+  }
 
   attachable &operator =(const attachable &src);
 
@@ -232,6 +245,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
@@ -413,6 +429,7 @@
   void get (uint32 &i) { i = get_sint64 (); }
   void get (sint64 &i) { i = get_sint64 (); }
 
+  void parse_warn (const char *msg);
   bool parse_error (const char *type = 0, const char *name = 0, bool skip = true);
 };