--- deliantra/server/include/cfperl.h	2007/06/06 05:41:26	1.78
+++ deliantra/server/include/cfperl.h	2007/11/08 19:43:24	1.90
@@ -1,25 +1,24 @@
 /*
- * This file is part of Crossfire TRT, the Multiplayer Online Role Playing Game.
+ * This file is part of Deliantra, the Roguelike Realtime MMORPG.
  * 
- * Copyright (©) 2005,2006,2007 Marc Alexander Lehmann / Robin Redeker / the Crossfire TRT team
+ * Copyright (©) 2005,2006,2007 Marc Alexander Lehmann / Robin Redeker / the Deliantra 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.
+ * Deliantra 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>
+ * The authors can be reached via e-mail to <support@deliantra.net>
  */
 
 //
@@ -58,6 +57,7 @@
 #undef gethostbyname
 #undef ctime
 #undef strerror
+#undef _
 
 // same here, massive symbol spamming
 #undef do_open
@@ -72,6 +72,11 @@
 
 //////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
 
+#define _(msg)  (msg)
+#define N_(msg) (msg)
+
+//////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
+
 // some macros to simplify perl in-calls
 
 #define CHECK_ERROR			\
@@ -91,11 +96,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 +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
@@ -244,6 +260,7 @@
 
 //////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
 
+INTERFACE_CLASS(object_freezer)
 struct object_freezer : dynbuf_text
 {
   AV *av;
@@ -357,12 +374,13 @@
     put (k, (T *)v);
   }
 
-  bool save (const char *path);
+  MTH bool save (const_octet_string path);
   char *as_string (); // like strdup
 
   operator bool () { return !!av; }
 };
 
+INTERFACE_CLASS(object_thawer)
 struct object_thawer
 {
   char *line; // current beginning of line
@@ -375,7 +393,7 @@
   char *value_nn; // the value, or the empty string if no value
   const char *name;
 
-  operator bool () { return !!text; }
+  operator bool () const { return !!text; }
 
   object_thawer (const char *path = 0);
   object_thawer (const char *data, AV *perlav);
@@ -384,10 +402,11 @@
   void get (attachable *obj, int oid);
 
   // parse next line
-  void next ();
+  MTH void next ();
   // skip the current key-value (usually fetch next line, for
   // multiline-fields, skips till the corresponding end-kw
-  void skip ();
+  MTH void skip ();
+  MTH void skip_block (); // skips till and over KW_end
 
   char *get_str () { return value; } // may be 0
   void get_ml (keyword kend, shstr &sh);
@@ -413,7 +432,18 @@
   void get (uint32 &i) { i = get_sint64 (); }
   void get (sint64 &i) { i = get_sint64 (); }
 
-  bool parse_error (const char *type = 0, const char *name = 0, bool skip = true);
+  MTH void parse_warn (const char *msg);
+  MTH bool parse_error (const char *type = 0, const char *name = 0, bool skip = true);
+
+  struct delayed_ref {
+    attachable *op;
+    object_ptr *ptr;
+    const char *ref;
+  };
+  std::vector<delayed_ref> delrefs;
+
+  void delayed_deref (attachable *op, object_ptr &ptr, const char *ref);
+  MTH void resolve_delayed_derefs (bool deref = true);
 };
 
 //TODO: remove
@@ -427,8 +457,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 ();
@@ -443,7 +472,7 @@
 
   static bool cede_to_tick ()
   {
-    if (expect_true (time () < next_cede))
+    if (expect_true (now () < next_cede))
       return false;
 
     do_cede_to_tick ();