--- deliantra/server/server/cfperl.xs	2006/12/15 19:29:18	1.83
+++ deliantra/server/server/cfperl.xs	2006/12/15 19:59:20	1.84
@@ -138,7 +138,7 @@
 inline SV *to_sv (unsigned long long v) { return newSVval64 (v); }
 inline SV *to_sv (float          v) { return newSVnv (v); }
 inline SV *to_sv (double         v) { return newSVnv (v); }
-inline SV *to_sv (client_socket *v) { return newSVattachable (v, "cf::client_socket::wrap"); }
+inline SV *to_sv (client *       v) { return newSVattachable (v, "cf::client::wrap"); }
 inline SV *to_sv (player *       v) { return newSVattachable (v, "cf::player::wrap"); }
 inline SV *to_sv (object *       v) { return newSVattachable (v, v && v->type == PLAYER ? "cf::object::player::wrap" : "cf::object::wrap"); }
 inline SV *to_sv (maptile *      v) { return newSVattachable (v, "cf::map::wrap"); }
@@ -176,7 +176,7 @@
 inline void sv_to (SV *sv, unsigned long long &v) { v = (unsigned long long)SvVAL64 (sv); }
 inline void sv_to (SV *sv, float          &v) { v = SvNV (sv); }
 inline void sv_to (SV *sv, double         &v) { v = SvNV (sv); }
-inline void sv_to (SV *sv, client_socket *&v) { v = (client_socket *)SvPTR_ornull (sv, "cf::client_socket"); }
+inline void sv_to (SV *sv, client *       &v) { v = (client *)SvPTR_ornull (sv, "cf::client"); }
 inline void sv_to (SV *sv, player *       &v) { v = (player *)SvPTR_ornull (sv, "cf::player"); }
 inline void sv_to (SV *sv, object *       &v) { v = (object *)SvPTR_ornull (sv, "cf::object"); }
 inline void sv_to (SV *sv, archetype *    &v) { v = (archetype *)SvPTR_ornull (sv, "cf::arch"); }
@@ -246,7 +246,7 @@
         break;
 
       case DT_SOCKET:
-        sv = to_sv (va_arg (ap, client_socket *));
+        sv = to_sv (va_arg (ap, client *));
         break;
 
       case DT_PLAYER:
@@ -1660,7 +1660,7 @@
 }
 
 bool
-add_client_socket (int fd, const char *peername)
+add_client (int fd, const char *peername)
 
 NV floor (NV x)
 
@@ -2424,11 +2424,11 @@
 
 INCLUDE: $PERL genacc Settings ../include/global.h |
 
-MODULE = cf        PACKAGE = cf::client_socket
+MODULE = cf        PACKAGE = cf::client
 
-INCLUDE: $PERL genacc client_socket ../include/newserver.h |
+INCLUDE: $PERL genacc client ../include/client.h |
 
-int invoke (client_socket *ns, int event, ...)
+int invoke (client *ns, int event, ...)
 	CODE:
         if (KLASS_OF (event) != KLASS_SOCKET) croak ("event class must be SOCKET");
 	AV *av = (AV *)sv_2mortal ((SV *)newAV ());
@@ -2436,5 +2436,5 @@
         RETVAL = INVOKE_((event_type)event, ARG_SOCKET (ns), ARG_AV (av));
 	OUTPUT: RETVAL
 
-SV *registry (client_socket *ns)
+SV *registry (client *ns)