--- deliantra/server/include/cfperl.h	2006/08/25 15:21:56	1.4
+++ deliantra/server/include/cfperl.h	2006/08/25 17:11:53	1.5
@@ -9,7 +9,7 @@
 enum data_type {
   DT_END,     // no further arguments
   DT_INT,
-  DT_LONG,
+  DT_INT64,
   DT_DOUBLE,
   DT_STRING,  // 0-terminated string
   DT_DATA,    // string + length
@@ -19,6 +19,11 @@
   DT_ARCH,
   DT_PARTY,
   DT_REGION,
+
+  // following are only for cfapi-compatibility
+  DT_INT_PTR,
+  DT_INT64_PTR,
+  DT_DOUBLE_PTR,
 };
 
 enum event_klass {
@@ -29,17 +34,17 @@
 };
 
 enum event_type {
-# define def(klass,name) EV_ ## klass ## name,
+# define def(klass,name) EV_ ## klass ## _ ## name,
 #  include "eventinc.h"
 # undef def
   NUM_EVENT_TYPES
 };
 
 #define ARG_INT(v)    DT_INT   , static_cast<int>    (v)
-#define ARG_LONG(v)   DT_LONG  , static_cast<long>   (v)
+#define ARG_INT64(v)  DT_INT64 , static_cast<sint64> (v)
 #define ARG_DOUBLE(v) DT_DOUBLE, static_cast<double> (v)
-#define ARG_STRING(v) DT_STRING, static_cast<char *> (v)
-#define ARG_DATA(s,l) DT_DATA  , static_cast<void *> (s), (l)
+#define ARG_STRING(v) DT_STRING, static_cast<const char *> (v)
+#define ARG_DATA(s,l) DT_DATA  , static_cast<const void *> (s), (l)
 #define ARG_OBJECT(o) DT_OBJECT, static_cast<struct object *>    (o)
 #define ARG_MAP(o)    DT_MAP   , static_cast<struct mapstruct *> (o)
 #define ARG_PLAYER(o) DT_PLAYER, static_cast<struct pl *>        (o)
@@ -50,7 +55,7 @@
 // the ", ## __VA_ARGS" is, unfortunately, a gnu-cpp extension
 
 // all these return true when the normal event processing should be skipped (if any)
-#define INVOKE(klass, event, ...) cfperl_invoke (EV_ ## klass ## event, ## __VA_ARGS__, DT_END)
+#define INVOKE(klass, event, ...) cfperl_invoke (EV_ ## klass ## _ ## event, ## __VA_ARGS__, DT_END)
 
 #define INVOKE_GLOBAL(event, ...)     INVOKE (GLOBAL, event,                  ## __VA_ARGS__)
 #define INVOKE_OBJECT(event, op, ...) INVOKE (OBJECT, event, ARG_OBJECT (op), ## __VA_ARGS__)