--- deliantra/server/include/cfperl.h	2006/12/25 11:25:49	1.41
+++ deliantra/server/include/cfperl.h	2006/12/30 15:07:59	1.43
@@ -13,9 +13,15 @@
 #include <XSUB.h>
 
 #include <EventAPI.h>
+#include <CoroAPI.h>
 
+#include "util.h"
+#include "keyword.h"
+#include "dynbuf.h"
 #include "callback.h"
 
+//////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
+
 // optimisations/workaround for functions requiring my_perl in scope (anti-bloat)
 #undef localtime
 #undef srand48
@@ -30,15 +36,37 @@
 // same here, massive symbol spamming
 #undef do_open
 #undef do_close
+#undef ref
 
 // perl bug #40256: perl does overwrite those with reentrant versions
 // but does not initialise their state structures.
 #undef random
 #undef crypt
 
+//////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
+
+// some macros to simplify perl in-calls
+
+#define CHECK_ERROR			\
+  if (SvTRUE (ERRSV))			\
+    LOG (llevError, "runtime error in %s: %s\n", __func__, SvPVutf8_nolen (ERRSV));
+
+#define CALL_BEGIN(args) dSP; ENTER; SAVETMPS; PUSHMARK (SP); EXTEND (SP, args)
+#define CALL_ARG_SV(sv) PUSHs (sv_2mortal (sv)) // separate because no refcount inc
+#define CALL_ARG(expr) PUSHs (sv_2mortal (to_sv (expr)))
+#define CALL_CALL(name, flags) PUTBACK; int count = call_pv (name, (flags) | G_EVAL); SPAGAIN;
+#define CALL_END CHECK_ERROR; FREETMPS; LEAVE
+
+//////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
+
 void cfperl_init ();
 void cfperl_main ();
 
+//////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
+
+// virtual server time, excluding time jumps and lag
+extern double runtime;
+
 enum event_klass
 {
   KLASS_NONE,
@@ -91,8 +119,12 @@
 double cfperl_result_DOUBLE (int idx);
 int cfperl_result_INT (int idx);
 
+//////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
+
 struct attachable
 {
+  static MGVTBL vtbl;
+
   static unordered_vector<attachable *> mortals;
   static void check_mortals ();
 
@@ -167,6 +199,8 @@
 
 extern struct global gbl_ev;
 
+//////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
+
 struct object_freezer : dynbuf
 {
   AV *av;
@@ -305,7 +339,7 @@
   SV *text; // text part
   AV *av;   // perl part
   char *line; // current beginning of line
-  char *last_value;
+  char *last_keyword, *last_value;
 
   operator bool () { return !!text; }
 
@@ -316,6 +350,7 @@
   void get (attachable *obj, int oid);
 
   keyword get_kv (); // also parse value for later use
+  void skip_kv (keyword kw);
 
   const char *get_str () { return last_value; } // may be 0
 
@@ -327,9 +362,10 @@
   sint64 get_sint64 () const;
   double get_double () const;
 
-  void get (float &v)  { v = get_double (); }
+  void get (float  &v) { v = get_double (); }
   void get (double &v) { v = get_double (); }
 
+  void get (bool   &i) { i = get_sint32 (); }
   void get (sint8  &i) { i = get_sint32 (); }
   void get (uint8  &i) { i = get_sint32 (); }
   void get (sint16 &i) { i = get_sint32 (); }
@@ -342,6 +378,15 @@
 
 char *fgets (char *s, int n, object_thawer &thawer);
 
+//////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
+
+struct coroapi {
+  static struct CoroAPI *GCoroAPI;
+
+  static int nready () { return CORO_NREADY; }
+  static int cede   () { return CORO_CEDE  ; }
+};
+
 struct watcher_base
 {
   static struct EventAPI *GEventAPI;