--- deliantra/server/include/cfperl.h	2007/04/16 06:23:41	1.60
+++ deliantra/server/include/cfperl.h	2007/05/19 00:08:11	1.64
@@ -4,7 +4,9 @@
 #ifndef CFPERL_H__
 #define CFPERL_H__
 
+#include <cstdarg>
 #include <cstdio>
+#include <bitset>
 
 using namespace std;
 
@@ -90,6 +92,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)
@@ -185,7 +191,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 ();
 
@@ -207,7 +224,7 @@
 
 //////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
 
-struct object_freezer : dynbuf
+struct object_freezer : dynbuf_text
 {
   AV *av;
 
@@ -408,18 +425,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