--- deliantra/server/include/cfperl.h	2006/08/27 16:15:12	1.8
+++ deliantra/server/include/cfperl.h	2006/08/27 17:59:26	1.10
@@ -63,12 +63,13 @@
 // 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 (EVENT_ ## klass ## _ ## event, ## __VA_ARGS__, DT_END)
+#define INVOKE_(event, ...) cfperl_invoke (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__)
-#define INVOKE_PLAYER(event, pl, ...) INVOKE (PLAYER, event, ARG_PLAYER (pl), ## __VA_ARGS__)
-#define INVOKE_MAP(event, map, ...)   INVOKE (MAP   , event, ARG_MAP (map)  , ## __VA_ARGS__)
+#define INVOKE(klass, event, ...)     INVOKE_(EVENT_ ## klass  ## _ ## event,                  ## __VA_ARGS__)
+#define INVOKE_GLOBAL(event, ...)     INVOKE_(EVENT_ ## GLOBAL ## _ ## event,                  ## __VA_ARGS__)
+#define INVOKE_OBJECT(event, op, ...) INVOKE_(EVENT_ ## OBJECT ## _ ## event, ARG_OBJECT (op), ## __VA_ARGS__)
+#define INVOKE_PLAYER(event, pl, ...) INVOKE_(EVENT_ ## PLAYER ## _ ## event, ARG_PLAYER (pl), ## __VA_ARGS__)
+#define INVOKE_MAP(event, map, ...)   INVOKE_(EVENT_ ## MAP    ## _ ## event, ARG_MAP (map)  , ## __VA_ARGS__)
 
 //TODO should index into @result
 #define RESULT(idx,type) cfperl_result_ ## type (idx)
@@ -77,7 +78,7 @@
 bool cfperl_invoke (event_type event, ...);
 int cfperl_result_INT (int idx);
 
-struct extendable_base
+struct attachable_base
 {
   void *self, *cb;    // CF+ perl self and callback
   const char *attach; // generic extension attachment information
@@ -85,18 +86,18 @@
   void clear ();                                 // called when free'ing objects
   void optimise ();                              // possibly save some memory by destroying unneeded data
 
-  void extendable_init ()
+  void attachable_init ()
   {
     self = cb = 0;
     attach = 0;
   }
 };
 
-// objects extendable from perl (or any other extension) should include or
+// objects attachable from perl (or any other extension) should include or
 // derive using the curiously recurring template pattern, to avoid
 // virtual method calls etc.
 template<class subclass>
-struct extendable : extendable_base
+struct attachable : attachable_base
 {
   static data_type get_dt ()
   {
@@ -113,12 +114,12 @@
   object_freezer (const char *filename);
   ~object_freezer ();
 
-  void put (extendable_base *ext);
+  void put (attachable_base *ext);
 
   template<class subclass>
-  void put (extendable<subclass> *obj)
+  void put (attachable<subclass> *obj)
   {
-    put ((extendable_base *)obj);
+    put ((attachable_base *)obj);
   }
 
   void finish ();
@@ -132,10 +133,10 @@
   object_thawer (const char *filename = 0);
   ~object_thawer ();
 
-  void get (data_type type, void *obj, extendable_base *ext);
+  void get (data_type type, void *obj, attachable_base *ext);
 
   template<class subclass>
-  void get (extendable<subclass> *obj)
+  void get (attachable<subclass> *obj)
   {
     if (av)
       get (subclass::get_dt (), (subclass *)obj, obj);