--- deliantra/server/include/cfperl.h	2007/06/05 13:05:02	1.77
+++ deliantra/server/include/cfperl.h	2007/08/06 10:54:12	1.86
@@ -1,23 +1,22 @@
 /*
- * This file is part of Crossfire TRT, the Multiplayer Online Role Playing Game.
+ * This file is part of Crossfire TRT, the Roguelike Realtime MORPG.
  * 
  * Copyright (©) 2005,2006,2007 Marc Alexander Lehmann / Robin Redeker / the Crossfire TRT team
  * Copyright (©) 2002,2007 Mark Wedel & Crossfire Development Team
  * Copyright (©) 1992,2007 Frank Tore Johansen
  * 
- * Crossfire TRT is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License as published by the Free
- * Software Foundation; either version 2 of the License, or (at your option)
- * any later version.
+ * Crossfire TRT is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
  * 
- * This program is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
- * or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
- * for more details.
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
  * 
- * You should have received a copy of the GNU General Public License along
- * with Crossfire TRT; if not, write to the Free Software Foundation, Inc. 51
- * Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
  * 
  * The authors can be reached via e-mail to <crossfire@schmorp.de>
  */
@@ -91,11 +90,13 @@
 void cfperl_emergency_save ();
 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);
 
 //////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
 
-// virtual server time, excluding time jumps and lag
-extern double runtime;
+extern tstamp runtime; // virtual server time, excluding time jumps and lag
+extern tstamp NOW;     // real time of current server tick
 
 enum event_klass
 {
@@ -155,7 +156,7 @@
 //////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
 
 INTERFACE_CLASS (attachable)
-struct attachable
+struct attachable : refcnt_base
 {
   static MGVTBL vtbl;
 
@@ -166,14 +167,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 +198,17 @@
   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);
 
   attachable &operator =(const attachable &src);
 
@@ -232,6 +229,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
@@ -265,7 +265,7 @@
   }
 
   template<typename T>
-  void put_string (keyword k, const T &v)
+  void put_kw_string (keyword k, const T &v)
   {
     int klen = keyword_len [k];
     int vlen = v ? strlen (v) + 1 : 0;
@@ -285,12 +285,12 @@
 
   void put (keyword k, const char *v = 0)
   {
-    put_string (k, v);
+    put_kw_string (k, v);
   }
 
   void put (keyword k, const shstr &v)
   {
-    put_string (k, v);
+    put_kw_string (k, v);
   }
 
   void put (keyword k, double v)
@@ -347,11 +347,9 @@
     fadd (keyword_str [kend], keyword_len [kend]); fadd ('\n');
   }
 
-  template<typename T>
-  void put (keyword k, const T *v)
-  {
-    put (k, v ? &v->name : (const char *)0);
-  }
+  void put (keyword k, archetype *v);
+  void put (keyword k, treasurelist *v);
+  void put (keyword k, faceinfo *v);
 
   template<typename T>
   void put (keyword k, const refptr<T> &v)
@@ -415,6 +413,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);
 };
 
@@ -429,8 +428,7 @@
   static int nready () { return CORO_NREADY; }
   static int cede   () { return CORO_CEDE  ; }
 
-  static double (*time)();
-  static double next_cede;
+  static tstamp next_cede;
   static int cede_counter;
 
   static void do_cede_every ();
@@ -445,7 +443,7 @@
 
   static bool cede_to_tick ()
   {
-    if (expect_true (time () < next_cede))
+    if (expect_true (now () < next_cede))
       return false;
 
     do_cede_to_tick ();