--- deliantra/server/include/cfperl.h	2007/01/09 21:32:42	1.50
+++ deliantra/server/include/cfperl.h	2007/05/24 03:33:29	1.65
@@ -4,7 +4,9 @@
 #ifndef CFPERL_H__
 #define CFPERL_H__
 
+#include <cstdarg>
 #include <cstdio>
+#include <bitset>
 
 using namespace std;
 
@@ -63,6 +65,8 @@
 void cfperl_init ();
 void cfperl_main ();
 void cfperl_emergency_save ();
+void cfperl_cleanup (int make_core);
+void cfperl_make_book (object *book, int level);
 
 //////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
 
@@ -89,6 +93,10 @@
   NUM_EVENT_TYPES
 };
 
+// in which global events or per-type events are we interested
+extern bitset<NUM_EVENT_TYPES> ev_want_event;
+extern bitset<NUM_TYPES>       ev_want_type;
+
 #define ARG_AV(o)         DT_AV    , static_cast<AV *>   (o)
 #define ARG_INT(v)        DT_INT   , static_cast<int>    (v)
 #define ARG_INT64(v)      DT_INT64 , static_cast<sint64> (v)
@@ -132,13 +140,13 @@
   MTH static void check_mortals ();
 
   enum {
-    F_DESTROYED = 0x01,
-    F_BORROWED  = 0x02,
+    F_DESTROYED   = 0x01,
+    F_DEBUG_TRACE = 0x02,
   };
 
   // object is delete'd after the refcount reaches 0
-  mutable int ACC (RW, refcnt);
   int ACC (RW, flags);
+  mutable int ACC (RW, refcnt);
 
   MTH void refcnt_inc () const { ++refcnt; }
   MTH void refcnt_dec () const { --refcnt; }
@@ -167,7 +175,8 @@
   AV *cb;       // CF+ callbacks
   shstr attach; // generic extension attachment information
 
-  void optimise ();  // possibly save some memory by destroying unneeded data
+  void sever_self (); // sever this object from its self, if it has one.
+  void optimise ();   // possibly save some memory by destroying unneeded data
 
   attachable ()
   : flags (0), refcnt (0), self (0), cb (0), attach (0)
@@ -183,7 +192,18 @@
 
   attachable &operator =(const attachable &src);
 
-  bool invoke (event_type event, ...);
+  bool vinvoke (event_type event, va_list &ap);
+  bool invoke (event_type event, ...)
+  {
+    if (ev_want_event [event] || cb)
+      {
+        va_list ap;
+        va_start (ap, event);
+        vinvoke (event, ap);
+        va_end (ap);
+      }
+  }
+
   MTH void instantiate ();
   void reattach ();
 
@@ -205,7 +225,7 @@
 
 //////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
 
-struct object_freezer : dynbuf
+struct object_freezer : dynbuf_text
 {
   AV *av;
 
@@ -335,15 +355,17 @@
 };
 
 // compatibility support, should be removed when no longer needed
-int fprintf (object_freezer &freezer, const char *format, ...);
-int fputs (const char *s, object_freezer &freezer);
+void fprintf (object_freezer &freezer, const char *format, ...);
+void fputs (const char *s, object_freezer &freezer);
 
 struct object_thawer
 {
   SV *text; // text part
   AV *av;   // perl part
+  int linenum;
   char *line; // current beginning of line
-  char *last_keyword, *last_value;
+  keyword kw;
+  char *kw_str, *value;
   const char *name;
 
   operator bool () { return !!text; }
@@ -354,13 +376,23 @@
 
   void get (attachable *obj, int oid);
 
-  keyword get_kv (); // also parse value for later use
-  void skip_kv (keyword kw);
+  // parse next line
+  void next ();
+  // skip the current key-value (usually fetch next line, for
+  // multiline-fields, skips untilt he corresponding end-kw
+  void skip ();
+
+  //TODO: remove, deprecated
+  keyword get_kv ()
+  {
+    next ();
+    return kw;
+  }
 
-  const char *get_str () { return last_value; } // may be 0
+  char *get_str () { return value; } // may be 0
 
   void get (shstr &sh) const;
-  void get_ornull (shstr &sh) const { sh = last_value; }
+  void get_ornull (shstr &sh) const { sh = value; }
   void get_ml (keyword kend, shstr &sh);
 
   sint32 get_sint32 () const;
@@ -379,8 +411,11 @@
 
   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);
 };
 
+//TODO: remove
 char *fgets (char *s, int n, object_thawer &thawer);
 
 //////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
@@ -391,18 +426,34 @@
   static int nready () { return CORO_NREADY; }
   static int cede   () { return CORO_CEDE  ; }
 
+  static double (*time)();
+  static double next_cede;
   static int cede_counter;
 
+  static void do_cede_every ();
+  static void do_cede_to_tick ();
+  static void do_cede_to_tick_every ();
+
   static void cede_every (int count)
   {
     if (++cede_counter >= count)
-      {
-        cede_counter = 0;
+      do_cede_every ();
+  }
 
-        if (coroapi::nready ())
-          coroapi::cede ();
-      }
+  static void cede_to_tick ()
+  {
+    if (time () >= next_cede)
+      do_cede_to_tick ();
   }
+
+  static void cede_to_tick_every (int count)
+  {
+    if (++cede_counter >= count)
+      cede_to_tick ();
+  }
+
+  static void wait_for_tick ();
+  static void wait_for_tick_begin ();
 };
 
 struct watcher_base