[ViewVC] Diff of: cvs/deliantra/server/server/cfperl.xs

Comparing deliantra/server/server/cfperl.xs (file contents):
Revision 1.55 by root, Tue Sep 12 18:15:34 2006 UTC vs.
Revision 1.106 by root, Sat Dec 23 15:49:40 2006 UTC

  *  GNU General Public License for more details.
  *
  *  You should have received a copy of the GNU General Public License
  *  along with this program; if not, write to the Free Software
  *  Foundation, Inc. 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301 USA
-*/
+ */
 #define PLUGIN_NAME    "perl"
 #define PLUGIN_VERSION "cfperl 0.5"
 #include <plugin_common.h>
 #include "perlxsi.c"
 extern sint64 *levels; // the experience table
-typedef object    object_ornull;
+typedef object  object_ornull;
-typedef mapstruct mapstruct_ornull;
+typedef maptile maptile_ornull;
+#if IVSIZE >= 8
+  typedef IV val64;
+# define newSVval64 newSViv
+# define SvVAL64 SvIV
+#else
-typedef double val64;
+  typedef double val64;
-#define newSVval64 newSVnv
+# define newSVval64 newSVnv
-#define SvVAL64 SvNV
+# define SvVAL64 SvNV
+#endif
 static f_plug_api gethook             = cfapi_get_hooks;
 static f_plug_api object_set_property = cfapi_object_set_property;
 static f_plug_api object_insert       = cfapi_object_insert;
-static HV *obj_cache;
 static PerlInterpreter *perl;
-static AV *cb_global, *cb_object, *cb_player, *cb_type, *cb_map;
+static AV *cb_global, *cb_object, *cb_player, *cb_client, *cb_type, *cb_map;
-#define PUSHcfapi(type,value)    PUSHs (sv_2mortal (newSVcfapi (CFAPI_ ## type, (value))))
-#define PUSHcfapi_va(type,ctype) PUSHcfapi (type, va_arg (args, ctype))
-#define PUSH_OB  PUSHcfapi_va(POBJECT, object *)
-#define PUSH_PL  PUSHcfapi_va(PPLAYER, player *)
-#define PUSH_MAP PUSHcfapi_va(PMAP,    mapstruct *)
-#define PUSH_PV  PUSHcfapi_va(STRING,  const char *)
-#define PUSH_IV  PUSHs (sv_2mortal (newSViv (va_arg (args, int))))
 //////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
 static SV *
 newSVptr (void *ptr, const char *klass, HV *hv = newHV ())
   if (!obj->self)
     obj->self = newSVptr (obj, klass);
   return newSVsv (obj->self);
-}
-static void
-SVptr_cache_set (void *ptr, SV *sv)
-{
-  hv_store (obj_cache, (char *)&ptr, sizeof (ptr), sv, 0);
-}
-static SV *
-SVptr_cache_get (void *ptr)
-{
-  SV **he = hv_fetch (obj_cache, (char *)&ptr, sizeof (ptr), 0);
-  return he ? *he : 0;
-}
-static SV *
-newSVptr_cached (void *ptr, const char *klass)
-{
-  SV *sv;
-  if (!ptr)
-    return &PL_sv_undef;
-  sv = SVptr_cache_get (ptr);
-  if (!sv)
-    {
-      HV *hv = newHV ();
-      sv_magic ((SV *)hv, 0, PERL_MAGIC_ext, (char *)ptr, 0);
-      sv = sv_bless (newRV_noinc ((SV *)hv), gv_stashpv (klass, 1));
-      SVptr_cache_set (ptr, sv);
-    }
-  return newSVsv (sv);
 }
 static void
 clearSVptr (SV *sv)
 {
 inline SV *to_sv (unsigned long  v) { return newSVuv (v); }
 inline SV *to_sv (  signed long long v) { return newSVval64 (v); }
 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 *       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 (mapstruct *    v) { return newSVattachable (v, "cf::map::wrap"); }
+inline SV *to_sv (maptile *      v) { return newSVattachable (v, "cf::map::wrap"); }
 inline SV *to_sv (archetype *    v) { return newSVptr (v, "cf::arch::wrap"); }
 inline SV *to_sv (partylist *    v) { return newSVptr (v, "cf::party::wrap"); }
 inline SV *to_sv (region *       v) { return newSVptr (v, "cf::region::wrap"); }
 inline SV *to_sv (living *       v) { return newSVptr (v, "cf::living::wrap"); }
 //TODO:
 inline SV *to_sv (New_Face *     v) { return to_sv (v->name); }
 inline SV *to_sv (treasurelist * v) { return to_sv (v->name); }
+inline SV *to_sv (UUID           v)
+{
+  char buf[128];
+  snprintf (buf, 128, "<1,%" PRIx64 ">", v.seq);
+  return newSVpv (buf, 0);
+}
-inline void sv_to (SV *sv, shstr          &v) { v = SvPV_nolen (sv); }
+inline void sv_to (SV *sv, shstr          &v) { v = SvOK (sv) ? SvPV_nolen (sv) : 0; }
-inline void sv_to (SV *sv, char *         &v) { free (v); v = strdup (SvPV_nolen (sv)); } //TODO: verify that all simple pointers are strdup-managed
+inline void sv_to (SV *sv, char *         &v) { free (v); v = SvOK (sv) ? strdup (SvPV_nolen (sv)) : 0; }
 inline void sv_to (SV *sv, bool           &v) { v = SvIV (sv); }
 inline void sv_to (SV *sv,   signed char  &v) { v = SvIV (sv); }
 inline void sv_to (SV *sv, unsigned char  &v) { v = SvIV (sv); }
 inline void sv_to (SV *sv,   signed short &v) { v = SvIV (sv); }
 inline void sv_to (SV *sv, unsigned short &v) { v = SvIV (sv); }
 inline void sv_to (SV *sv, unsigned long  &v) { v = SvUV (sv); }
 inline void sv_to (SV *sv,   signed long long &v) { v = (  signed long long)SvVAL64 (sv); }
 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 *       &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"); }
-inline void sv_to (SV *sv, mapstruct *    &v) { v = (mapstruct *)SvPTR_ornull (sv, "cf::map"); }
+inline void sv_to (SV *sv, maptile *      &v) { v = (maptile *)SvPTR_ornull (sv, "cf::map"); }
 inline void sv_to (SV *sv, partylist *    &v) { v = (partylist *)SvPTR_ornull (sv, "cf::party"); }
 inline void sv_to (SV *sv, region *       &v) { v = (region *)SvPTR_ornull (sv, "cf::region"); }
 inline void sv_to (SV *sv, living *       &v) { v = (living *)SvPTR_ornull (sv, "cf::living"); }
 inline void sv_to (SV *sv, New_Face *     &v) { v = &new_faces[FindFace (SvPV_nolen (sv), 0)]; } //TODO
 template<class T>
 inline void sv_to (SV *sv, refptr<T>      &v) { T *tmp; sv_to (sv, tmp); v = tmp; }
 template<int N>
 inline void sv_to (SV *sv, char      (&v)[N]) { assign (v, SvPV_nolen (sv)); }
+inline void sv_to (SV *sv, rangetype      &v) { v = (rangetype)   SvIV (sv); }
+inline void sv_to (SV *sv, bowtype_t      &v) { v = (bowtype_t)   SvIV (sv); }
+inline void sv_to (SV *sv, petmode_t      &v) { v = (petmode_t)   SvIV (sv); }
+inline void sv_to (SV *sv, usekeytype     &v) { v = (usekeytype)  SvIV (sv); }
+inline void sv_to (SV *sv, unapplymode    &v) { v = (unapplymode) SvIV (sv); }
+inline void sv_to (SV *sv, UUID           &v)
+{
+  unsigned int version;
+  if (2 != sscanf (SvPV_nolen (sv), "<%d.%" SCNx64 ">", &version, &v.seq) || 1 != version)
+    croak ("unparsable uuid: %s", SvPV_nolen (sv));
+}
+inline void sv_to (SV *sv, object::flags_t::reference v) { v = boolSV (sv); }
 static SV *
 newSVdt_va (va_list &ap, data_type type)
 {
   SV *sv;
         sv = to_sv (va_arg (ap, object *));
         break;
       case DT_MAP:
         // va_arg (object *) when void * is passed is an XSI extension
-        sv = to_sv (va_arg (ap, mapstruct *));
+        sv = to_sv (va_arg (ap, maptile *));
+        break;
+      case DT_CLIENT:
+        sv = to_sv (va_arg (ap, client *));
         break;
       case DT_PLAYER:
         sv = to_sv (va_arg (ap, player *));
         break;
 }
 //////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
 SV *
-registry_of (attachable_base *ext)
+registry (attachable_base *ext)
 {
   if (!ext->cb)
     ext->cb = newAV ();
   return newRV_inc ((SV *)ext->cb);
     {
       if (cb)
         if (SvROK (*av_fetch (cb, EVENT_OBJECT_DESTROY, 1)))
           INVOKE_OBJECT (DESTROY, static_cast<object *>(this));
         else if (SvROK (*av_fetch (cb, EVENT_MAP_DESTROY, 1)))
-          INVOKE_MAP (DESTROY, static_cast<mapstruct *>(this));
+          INVOKE_MAP (DESTROY, static_cast<maptile *>(this));
       // disconnect Perl from C, to avoid crashes
       sv_unmagic (SvRV ((SV *)self), PERL_MAGIC_ext);
       // clear the perl hash, might or might not be a good idea
   HV *hv = (HV *)SvRV ((SV *)self);
   if (SvREFCNT ((SV *)self) == 1
       && SvREFCNT ((SV *)hv) == 1
-      && !HvKEYS (hv))
+      && !HvTOTALKEYS (hv))
     {
       SvREFCNT_dec ((SV *)self);
       self = 0;
     }
 }
   switch (type)
     {
       case DT_OBJECT: INVOKE_OBJECT (REATTACH, obj); break;
       case DT_PLAYER: INVOKE_PLAYER (REATTACH, obj); break;
+      case DT_CLIENT: INVOKE_CLIENT (REATTACH, obj); break;
       case DT_MAP:    INVOKE_MAP    (REATTACH, obj); break;
     }
 }
 template<class subclass>
   call_pv ("cf::object_freezer_save", G_VOID | G_DISCARD | G_EVAL);
   FREETMPS;
   LEAVE;
 }
+char *object_freezer::as_string ()
+{
+  dSP;
+  ENTER;
+  SAVETMPS;
+  PUSHMARK (SP);
+  EXTEND (SP, 3);
+  PUSHs (sv_2mortal (newRV_noinc (newSVpvn ((char *)linearise (), size ()))));
+  PUSHs (sv_2mortal (newRV_inc ((SV *)av)));
+  PUTBACK;
+  char *res = call_pv ("cf::object_freezer_as_string", G_SCALAR | G_EVAL) > 0
+              ? strdup (SvPVbyte_nolen (POPs))
+              : strdup ("[fatal error]");
+  FREETMPS;
+  LEAVE;
+  return res;
+}
 int fprintf (object_freezer &freezer, const char *format, ...)
 {
   va_list ap;
   va_start (ap, format);
 int fputs (const char *s, object_freezer &freezer)
 {
   freezer.add (s);
 }
+static const char thawer_eof[] = "\n\n\n\0\0\0";
 object_thawer::object_thawer (const char *filename)
 {
   static const char eof[] = "\n\n\n\0\0\0";
       PUTBACK;
       FREETMPS;
       LEAVE;
     }
+}
+object_thawer::object_thawer (const char *data, AV *perlav)
+{
+  av   = perlav;
+  text = newSVpv (data, 0);
+  sv_catpv (text, thawer_eof);
+  line = SvPVbyte_nolen (text);
 }
 void object_thawer::get (data_type type, void *obj, attachable_base *ext, int oid)
 {
   if (!av || oid < 0) // this is actually an error of sorts
 static CommArray_s rtn_cmd;
 static int
 runPluginCommand (object *obj, char *params)
 {
-  dSP;
+  return -1;
-  ENTER;
-  SAVETMPS;
-  PUSHMARK (SP);
-  EXTEND (SP, 3);
-  PUSHs (sv_2mortal (newSVpv (rtn_cmd.name, 0)));
-  PUSHs (sv_2mortal (newSVcfapi (CFAPI_POBJECT, obj)));
-  if (params)
-    PUSHs (sv_2mortal (newSVpv (params, 0)));
-  PUTBACK;
-  int count = call_pv ("cf::inject_command", G_SCALAR | G_EVAL);
-  SPAGAIN;
-  if (SvTRUE (ERRSV))
-    LOG (llevError, "command '%s' callback evaluation error: %s", rtn_cmd.name, SvPV_nolen (ERRSV));
-  int returnvalue = count > 0 ? POPi : -1;
-  PUTBACK;
-  FREETMPS;
-  LEAVE;
-  return returnvalue;
 }
 extern "C" void *cfperl_getPluginProperty (int *type, ...)
 {
   va_list args;
   va_start (args, type);
   propname = va_arg (args, char *);
   //printf ("Property name: %s\n", propname);
   if (!strcmp (propname, "command?"))
-    {
-      if (!perl)
-        return NULL;
+    return NULL;
-      const char *cmdname = va_arg (args, const char *);
-      HV *hv = get_hv ("cf::COMMAND", 1);
-      SV **svp = hv_fetch (hv, cmdname, strlen (cmdname) + 1, 0);
-      va_end (args);
-      if (svp)
-        {
-          // this is totaly broken, should stash it into %COMMAND
-          rtn_cmd.name = cmdname;
-          rtn_cmd.time = SvNV (*svp);
-          rtn_cmd.func = runPluginCommand;
-          return &rtn_cmd;
-        }
-    }
   else if (!strcmp (propname, "Identification"))
     {
       va_end (args);
-      return (void*) PLUGIN_NAME;
+      return (void *)PLUGIN_NAME;
     }
   else if (!strcmp (propname, "FullName"))
     {
       va_end (args);
-      return (void*) PLUGIN_VERSION;
+      return (void *)PLUGIN_VERSION;
     }
   else
     va_end (args);
   return NULL;
   PL_exit_flags |= PERL_EXIT_DESTRUCT_END;
   char *argv[] = {
     "",
     "-e"
-    "cf->bootstrap;"
+    "use Event;"      // required for bootstrap
+    "cf->bootstrap;"  // required for datadir :*>
     "unshift @INC, cf::datadir ();"
     "require cf;"
   };
   if (perl_parse (perl, xs_init, 2, argv, (char **)NULL) || perl_run (perl))
     {
       printf ("unable to initialize perl-interpreter, aborting.\n");
       exit (EXIT_FAILURE);
     }
-  obj_cache = newHV ();
 }
 void cfperl_main ()
 {
   dSP;
   AV *callbacks = 0;
   object *op;
   player *pl;
-  mapstruct *map;
+  maptile *map;
+  client *ns;
   // callback call ordering is:
-  // 1. per-object callback (NYI)
+  // 1. per-object callback
   // 2. per-class object
-  // 2a. per-type callback
+  // 3. per-type callback
   // 4. global callbacks
   gather_callbacks (callbacks, cb_global, event);
   switch (KLASS_OF (event))
         break;
       case KLASS_MAP:
         dt = (data_type) va_arg (ap, int);
         assert (("first argument must be of type object", dt == DT_MAP));
-        map = va_arg (ap, mapstruct *);
+        map = va_arg (ap, maptile *);
         if (map->cb)
           gather_callbacks (callbacks, map->cb, event);
         gather_callbacks (callbacks, cb_map, event);
+        break;
+      case KLASS_CLIENT:
+        dt = (data_type) va_arg (ap, int);
+        assert (("first argument must be of type client", dt == DT_CLIENT));
+        ns = va_arg (ap, client *);
+        if (ns->cb)
+          gather_callbacks (callbacks, ns->cb, event);
+        gather_callbacks (callbacks, cb_client, event);
         break;
       default:
         assert (("unsupported event klass in cfperl_invoke", 0));
     }
   switch (KLASS_OF (event))
     {
       case KLASS_OBJECT: PUSHs (sv_2mortal (newSVdt (DT_OBJECT, op)));  break;
       case KLASS_PLAYER: PUSHs (sv_2mortal (newSVdt (DT_PLAYER, pl)));  break;
+      case KLASS_CLIENT: PUSHs (sv_2mortal (newSVdt (DT_CLIENT, ns)));  break;
       case KLASS_MAP:    PUSHs (sv_2mortal (newSVdt (DT_MAP,    map))); break;
     }
   for (;;)
     {
 cfperl_result_INT (int idx)
 {
   return SvIV (cfperl_result (idx));
 }
+double
+cfperl_result_DOUBLE (int idx)
+{
+  return SvNV (cfperl_result (idx));
+}
+/////////////////////////////////////////////////////////////////////////////
+struct EventAPI *watcher_base::GEventAPI;
+static void iw_dispatch (pe_event *ev)
+{
+  iw *w = (iw *)ev->ext_data;
+  w->call (*w);
+}
+void
+iw::alloc ()
+{
+  pe = GEventAPI->new_idle (0, 0);
+  pe->base.callback = (void *)iw_dispatch;
+  pe->base.ext_data = (void *)this;
+}
+static void iow_dispatch (pe_event *ev)
+{
+  iow *w = (iow *)ev->ext_data;
+  w->call (*w, ((pe_ioevent *)ev)->got);
+}
+void
+iow::alloc ()
+{
+  pe = GEventAPI->new_io (0, 0);
+  pe->base.callback = (void *)iow_dispatch;
+  pe->base.ext_data = (void *)this;
+  pe->fd   = -1;
+  pe->poll = 0;
+}
+void
+iow::fd (int fd)
+{
+  pe->fd = fd;
+}
+int
+iow::poll ()
+{
+  return pe->poll;
+}
+void
+iow::poll (int events)
+{
+  if (pe->poll != events)
+    {
+      if (pe->poll) stop  ();
+      pe->poll = events;
+      if (pe->poll) start ();
+    }
+}
 MODULE = cf             PACKAGE = cf         PREFIX = cf_
 BOOT:
 {
   HV *stash = gv_stashpv ("cf", 1);
+  I_EVENT_API (PACKAGE);
+  watcher_base::GEventAPI = GEventAPI;
+  newCONSTSUB (stash, "VERSION", newSVpv (VERSION, sizeof (VERSION) - 1));
   static const struct {
     const char *name;
     IV iv;
   } *civ, const_iv[] = {
     const_iv (POTION)
     const_iv (FOOD)
     const_iv (POISON)
     const_iv (BOOK)
     const_iv (CLOCK)
-    const_iv (LIGHTNING)
     const_iv (ARROW)
     const_iv (BOW)
     const_iv (WEAPON)
     const_iv (ARMOUR)
     const_iv (PEDESTAL)
     const_iv (AMULET)
     const_iv (PLAYERMOVER)
     const_iv (TELEPORTER)
     const_iv (CREATOR)
     const_iv (SKILL)
-    const_iv (EXPERIENCE)
     const_iv (EARTHWALL)
     const_iv (GOLEM)
     const_iv (THROWN_OBJ)
     const_iv (BLINDNESS)
     const_iv (GOD)
     const_iv (FLOOR)
     const_iv (FLESH)
     const_iv (INORGANIC)
     const_iv (SKILL_TOOL)
     const_iv (LIGHTER)
-    const_iv (TRAP_PART)
-    const_iv (WALL)
+    const_iv (BUILDABLE_WALL)
-    const_iv (LIGHT_SOURCE)
     const_iv (MISC_OBJECT)
-    const_iv (MONSTER)
-    const_iv (SPAWN_GENERATOR)
     const_iv (LAMP)
     const_iv (DUPLICATOR)
-    const_iv (TOOL)
     const_iv (SPELLBOOK)
-    const_iv (BUILDFAC)
     const_iv (CLOAK)
     const_iv (SPINNER)
     const_iv (GATE)
     const_iv (BUTTON)
     const_iv (CF_HANDLE)
     const_iv (SPELL_EFFECT)
     const_iv (CONVERTER)
     const_iv (BRACERS)
     const_iv (POISONING)
     const_iv (SAVEBED)
-    const_iv (POISONCLOUD)
-    const_iv (FIREHOLES)
     const_iv (WAND)
     const_iv (SCROLL)
     const_iv (DIRECTOR)
     const_iv (GIRDLE)
     const_iv (FORCE)
     const_iv (DISEASE)
     const_iv (SYMPTOM)
     const_iv (BUILDER)
     const_iv (MATERIAL)
     const_iv (ITEM_TRANSFORMER)
-    const_iv (QUEST)
     const_iv (NUM_SUBTYPES)
     const_iv (ST_BD_BUILD)
     const_iv (ST_BD_REMOVE)
     const_iv (FLAG_MONSTER)
     const_iv (FLAG_FRIENDLY)
     const_iv (FLAG_GENERATOR)
     const_iv (FLAG_IS_THROWN)
     const_iv (FLAG_AUTO_APPLY)
-    const_iv (FLAG_TREASURE)
     const_iv (FLAG_PLAYER_SOLD)
     const_iv (FLAG_SEE_INVISIBLE)
     const_iv (FLAG_CAN_ROLL)
     const_iv (FLAG_OVERLAY_FLOOR)
     const_iv (FLAG_IS_TURNABLE)
     const_iv (FLAG_ACTIVATE_ON_RELEASE)
     const_iv (FLAG_IS_WATER)
     const_iv (FLAG_CONTENT_ON_GEN)
     const_iv (FLAG_IS_A_TEMPLATE)
     const_iv (FLAG_IS_BUILDABLE)
-    const_iv (FLAG_AFK)
     const_iv (NDI_BLACK)
     const_iv (NDI_WHITE)
     const_iv (NDI_NAVY)
     const_iv (NDI_RED)
     const_iv (NDI_MAX_COLOR)
     const_iv (NDI_COLOR_MASK)
     const_iv (NDI_UNIQUE)
     const_iv (NDI_ALL)
+    const_iv (UPD_LOCATION)
+    const_iv (UPD_FLAGS)
+    const_iv (UPD_WEIGHT)
+    const_iv (UPD_FACE)
+    const_iv (UPD_NAME)
+    const_iv (UPD_ANIM)
+    const_iv (UPD_ANIMSPEED)
+    const_iv (UPD_NROF)
+    const_iv (UPD_SP_MANA)
+    const_iv (UPD_SP_GRACE)
+    const_iv (UPD_SP_DAMAGE)
     const_iv (F_APPLIED)
     const_iv (F_LOCATION)
     const_iv (F_UNPAID)
     const_iv (F_MAGIC)
     const_iv (F_CURSED)
     const_iv (F_BUY)
     const_iv (F_SHOP)
     const_iv (F_SELL)
     const_iv (P_BLOCKSVIEW)
+    const_iv (P_PLAYER)
     const_iv (P_NO_MAGIC)
     const_iv (P_IS_ALIVE)
     const_iv (P_NO_CLERIC)
     const_iv (P_NEED_UPDATE)
-    const_iv (P_NO_ERROR)
     const_iv (P_OUT_OF_MAP)
     const_iv (P_NEW_MAP)
     const_iv (UP_OBJ_INSERT)
     const_iv (UP_OBJ_REMOVE)
     const_iv (MAP_LOADING)
     const_iv (MAP_SAVING)
     const_iv (KLASS_GLOBAL)
     const_iv (KLASS_OBJECT)
+    const_iv (KLASS_CLIENT)
     const_iv (KLASS_PLAYER)
     const_iv (KLASS_MAP)
+    const_iv (CS_QUERY_YESNO)
+    const_iv (CS_QUERY_SINGLECHAR)
+    const_iv (CS_QUERY_HIDEINPUT)
+    const_iv (ST_DEAD)
+    const_iv (ST_SETUP)
+    const_iv (ST_PLAYING)
+    const_iv (ST_CUSTOM)
+    const_iv (ST_CHANGE_CLASS)
+    const_iv (ST_CONFIRM_QUIT)
+    const_iv (ST_GET_PARTY_PASSWORD)
   };
   for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; )
     newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));
       av_push (event, newSVpv ((char *)eiv->name + eiv->skip, 0));
       av_push (event, newSViv (eiv->klass));
       av_store (av, eiv->iv, newRV_noinc ((SV *)event));
       newCONSTSUB (stash, (char *)eiv->name, newSViv (eiv->iv));
     }
-  //I_EVENT_API (PACKAGE);
 }
 void _init_vars ()
 	CODE:
-        cb_global = get_av ("cf::CB_GLOBAL", 1);
+        cb_global  = get_av ("cf::CB_GLOBAL", 1);
-        cb_object = get_av ("cf::CB_OBJECT", 1);
+        cb_object  = get_av ("cf::CB_OBJECT", 1);
-        cb_player = get_av ("cf::CB_PLAYER", 1);
+        cb_player  = get_av ("cf::CB_PLAYER", 1);
+        cb_client  = get_av ("cf::CB_CLIENT", 1);
-        cb_type   = get_av ("cf::CB_TYPE"  , 1);
+        cb_type    = get_av ("cf::CB_TYPE"  , 1);
-        cb_map    = get_av ("cf::CB_MAP"   , 1);
+        cb_map     = get_av ("cf::CB_MAP"   , 1);
 void _global_reattach ()
 	CODE:
 {
         // reattach to all attachable objects in the game.
+        for (sockvec::iterator i = clients.begin (); i != clients.end (); ++i)
+          reattach (*i);
         for (player *pl = first_player; pl; pl = pl->next)
           reattach (pl);
-        for (mapstruct *map = first_map; map; map = map->next)
+        for (maptile *map = first_map; map; map = map->next)
           reattach (map);
-        for (object *op = objects; op; op = op->next)
+        for (object *op = object::first; op; op = op->next)
           reattach (op);
 }
 NV floor (NV x)
             case 5: RETVAL = settings.playerdir; break;
             case 6: RETVAL = settings.datadir  ; break;
           }
 	OUTPUT: RETVAL
-int
+void _exit (int status = 0)
-cf_find_animation (char *text)
+int find_animation (char *text)
 	PROTOTYPE: $
-int random_roll(int min, int max, object *op, int goodbad);
+int random_roll (int min, int max, object *op, int goodbad);
 const char *cost_string_from_value(uint64 cost, int approx = 0)
-int invoke (int event, ...)
-	CODE:
-        if (KLASS_OF (event) != KLASS_GLOBAL) croak ("event class must be GLOBAL");
-	AV *av = (AV *)sv_2mortal ((SV *)newAV ());
-        for (int i = 1; i < items; i++) av_push (av, SvREFCNT_inc (ST (i)));
-        RETVAL = INVOKE_((event_type)event, ARG_AV (av));
-	OUTPUT: RETVAL
 int
 exp_to_level (val64 exp)
         CODE:
 {
           RETVAL = newSVpv (resist_plus[atnr], 0);
         else
           XSRETURN_UNDEF;
         OUTPUT: RETVAL
+MODULE = cf        PACKAGE = cf::attachable
 int
-_valid (SV *obj)
+valid (SV *obj)
 	CODE:
         RETVAL = SvROK (obj) && mg_find (SvRV (obj), PERL_MAGIC_ext);
 	OUTPUT:
 	RETVAL
+MODULE = cf        PACKAGE = cf::global
+int invoke (SV *klass, int event, ...)
+	CODE:
+        if (KLASS_OF (event) != KLASS_GLOBAL) croak ("event class must be GLOBAL");
+	AV *av = (AV *)sv_2mortal ((SV *)newAV ());
+        for (int i = 1; i < items; i++) av_push (av, SvREFCNT_inc (ST (i)));
+        RETVAL = INVOKE_((event_type)event, ARG_AV (av));
+	OUTPUT: RETVAL
 MODULE = cf        PACKAGE = cf::object         PREFIX = cf_object_
+INCLUDE: $PERL genacc object ../include/object.h |
 int invoke (object *op, int event, ...)
 	CODE:
         if (KLASS_OF (event) != KLASS_OBJECT) croak ("event class must be OBJECT");
 	AV *av = (AV *)sv_2mortal ((SV *)newAV ());
         for (int i = 2; i < items; i++) av_push (av, SvREFCNT_inc (ST (i)));
         RETVAL = INVOKE_((event_type)event, ARG_OBJECT (op), ARG_AV (av));
 	OUTPUT: RETVAL
 SV *registry (object *op)
+void mortals ()
-	CODE:
+	PPCODE:
-        RETVAL = registry_of (op);
+        EXTEND (SP, object::mortals.size ());
-        OUTPUT:
+        for (AUTODECL (i, object::mortals.begin ()); i != object::mortals.end (); ++i)
-        RETVAL
+          PUSHs (to_sv (*i));
-INCLUDE: $PERL genacc object ../include/object.h |
+object *first ()
+	CODE:
+        RETVAL = object::first;
+	OUTPUT: RETVAL
 # missing properties
-int flag (object *op, int flag, int value = 1)
-	PROTOTYPE: $$;$
-	CODE:
-        RETVAL = QUERY_FLAG (op, flag);
-        if (items >= 3)
-          if (value)
-            SET_FLAG (op, flag);
-          else
-            CLEAR_FLAG (op, flag);
-        OUTPUT: RETVAL
 object *head (object *op)
 	PROTOTYPE: $
 	CODE:
         RETVAL = op->head ? op->head : op;
 	PROTOTYPE: $
         PPCODE:
 {
 	object *o;
 	for (o = obj->inv; o; o = o->below)
-          XPUSHs (sv_2mortal (newSVcfapi (CFAPI_POBJECT, o)));
+          XPUSHs (sv_2mortal (to_sv (o)));
 }
-int cf_object_get_resistance (object *op, int rtype)
+void
-        ALIAS: resistance = 0
+set_animation (object *op, int idx)
+	CODE:
+        SET_ANIMATION (op, idx);
+void
+object::drain_stat ()
+void
+object::drain_specific_stat (int stat)
+void
+object::change_luck (int change)
+void
+object::add_statbonus ()
+void
+object::remove_statbonus ()
+object *find_best_object_match (object *op, const char *match)
+object *find_marked_object (object *op)
 int need_identify (const object *obj);
 int apply_shop_mat (object *shop_mat, object *op);
 	CODE:
         RETVAL = move_ob (op, dir, originator);
 	OUTPUT:
         RETVAL
-void cf_object_apply (object *op, object *author, int flags = 0)
+void apply (object *applier, object *applied, int flags = 0)
+	CODE:
+        manual_apply (applied, applier, flags);
-void cf_object_apply_below (object *op)
+void apply_below (object *op)
+	CODE:
+        player_apply_below (op);
-void cf_object_remove (object *op)
+void remove (object *op)
+	CODE:
+        op->remove ();
-void cf_object_free (object *op)
+void
+object::destroy (int recursive = 0)
 object *cf_object_present_archname_inside (object *op, char *whatstr)
 int cf_object_transfer (object *op, int x, int y, int r = 0, object_ornull *orig = 0)
-int cf_object_change_map (object *op, int x, int y, mapstruct *map)
+int cf_object_change_map (object *op, int x, int y, maptile *map)
-object *cf_object_clone (object *op, int clonetype = 0)
+object *clone (object *op, int recursive = 0)
+	CODE:
+        if (recursive)
+          RETVAL = object_create_clone (op);
+        else
+	  {
+            RETVAL = object::create ();
+            op->copy_to (RETVAL);
+          }
+	OUTPUT: RETVAL
-int cf_object_pay_item (object *op, object *buyer)
+int pay_item (object *op, object *buyer)
+	CODE:
+        RETVAL = pay_for_item (op, buyer);
+	OUTPUT: RETVAL
-int cf_object_pay_amount (object *op, uint64 amount)
+int pay_amount (object *op, uint64 amount)
+	CODE:
+        RETVAL = pay_for_amount (amount, op);
+	OUTPUT: RETVAL
 void pay_player (object *op, uint64 amount)
 val64 pay_player_arch (object *op, const char *arch, uint64 amount)
-int cf_object_cast_spell (object *caster, object *ctoo, int dir, object *spell_ob, char *stringarg = 0)
+int cast_spell (object *op, object *caster, int dir, object *spell_ob, char *stringarg = 0)
-int cf_object_cast_ability (object *caster, object *ctoo, int dir, object *sp_, char *stringarg = 0)
+void learn_spell (object *op, object *sp, int special_prayer = 0)
+	CODE:
+        do_learn_spell (op, sp, special_prayer);
-void cf_object_learn_spell (object *op, object *sp)
-void cf_object_forget_spell (object *op, object *sp)
+void forget_spell (object *op, object *sp)
+	CODE:
+        do_forget_spell (op, query_name (sp));
-object *cf_object_check_for_spell (object *op, char *spellname)
+object *check_for_spell (object *op, char *spellname)
+	CODE:
+        RETVAL = check_spell_known (op, spellname);
+	OUTPUT: RETVAL
-int cf_object_query_money (object *op)
+int query_money (object *op)
 	ALIAS: money = 0
-int cf_object_query_cost (object *op, object *who, int flags)
+int query_cost (object *op, object *who, int flags)
 	ALIAS: cost = 0
-void cf_object_activate_rune (object *op , object *victim)
+void spring_trap (object *op, object *victim)
-int cf_object_check_trigger (object *op, object *cause)
+int check_trigger (object *op, object *cause)
-int cf_object_out_of_map (object *op, int x, int y)
-void cf_object_drop (object *op, object *author)
+void drop (object *who, object *op)
-void cf_object_take (object *op, object *author)
+void pick_up (object *who, object *op)
 object *cf_object_insert_object (object *op, object *container)
 object *cf_object_insert_in_ob (object *ob, object *where)
-int cf_object_teleport (object *op, mapstruct *map, int x, int y)
+int cf_object_teleport (object *op, maptile *map, int x, int y)
-void cf_object_update (object *op, int flags)
+void update_object (object *op, int action)
-void cf_object_pickup (object *op, object *what)
 object *cf_create_object_by_name (const char *name)
 void change_exp (object *op, uint64 exp, const char *skill_name = 0, int flag = 0)
 void push_button (object *op);
 void use_trigger (object *op);
-void add_button_link (object *button, mapstruct *map, int connected);
+void add_button_link (object *button, maptile *map, int connected);
 void remove_button_link (object *op);
-void
-cf_object_set_resistance (object *op, int rtype, int val)
-      CODE:
-        if (rtype >= 0 && rtype < NROFATTACKS)
-        op->resist[rtype] = val;
 MODULE = cf        PACKAGE = cf::object         PREFIX = cf_
-void cf_fix_object (object *pl)
-	ALIAS: fix = 0
 object *cf_insert_ob_in_ob (object *ob, object *where)
 # no clean way to get an object from an archetype - stupid idiotic
 # dumb kludgy misdesigned plug-in api slowly gets on my nerves.
         CODE:
         RETVAL = archetype ? get_archetype (archetype) : cf_create_object ();
         OUTPUT:
 	RETVAL
-object *insert_ob_in_map_at (object *ob, mapstruct *where, object_ornull *orig, int flag, int x, int y)
+object *insert_ob_in_map_at (object *ob, maptile *where, object_ornull *orig, int flag, int x, int y)
 	PROTOTYPE: $$$$$$
         CODE:
 {
 	int unused_type;
         RETVAL = (object *)object_insert (&unused_type, ob, 0, where, orig, flag, x, y);
 player *contr (object *op)
 	CODE:
         RETVAL = op->contr;
         OUTPUT: RETVAL
+void
+object::roll_stats ()
+void
+object::update_stats ()
+void
+object::swap_stats (int a, int b)
 const char *get_ob_key_value (object *op, const char *key)
 bool set_ob_key_value (object *op, const char *key, const char *value = 0, int add_key = 1)
 bool on_same_map_as (object *ob, object *other)
 	CODE:
         RETVAL = on_same_map (ob, other);
 	OUTPUT: RETVAL
-char *
+const char *
-base_name (object *ob, int plural)
+base_name (object *op, int plural = op->nrof > 1)
         CODE:
-        RETVAL = cf_query_base_name (ob, plural);
+        RETVAL = query_base_name (op, plural);
         OUTPUT: RETVAL
+object *decrease_ob_nr (object *op, unsigned long i)
 MODULE = cf        PACKAGE = cf::object::player PREFIX = cf_player_
 player *player (object *op)
 	CODE:
         RETVAL = op->contr;
 	OUTPUT: RETVAL
+void check_score (object *op)
 void cf_player_message (object *obj, char *txt, int flags = NDI_ORANGE | NDI_UNIQUE)
 object *cf_player_send_inventory (object *op)
 char *cf_player_get_ip (object *op)
 void cf_player_set_party (object *op, partylist *party)
 void kill_player (object *op)
+void esrv_update_item (object *op, int what, object *item)
+        C_ARGS: what, op, item
+void clear_los (object *op)
+int command_reset (object *op, char *params)
+int command_teleport (object *op, char *params)
+int command_summon (object *op, char *params)
+int command_arrest (object *op, char *params)
+int command_kick (object *op, char *params)
+int command_banish (object *op, char *params)
 MODULE = cf        PACKAGE = cf::player         PREFIX = cf_player_
+INCLUDE: $PERL genacc player ../include/player.h |
 int invoke (player *pl, int event, ...)
 	CODE:
         if (KLASS_OF (event) != KLASS_PLAYER) croak ("event class must be PLAYER");
 	AV *av = (AV *)sv_2mortal ((SV *)newAV ());
         for (int i = 2; i < items; i++) av_push (av, SvREFCNT_inc (ST (i)));
         RETVAL = INVOKE_((event_type)event, ARG_PLAYER (pl), ARG_AV (av));
 	OUTPUT: RETVAL
 SV *registry (player *pl)
+player *
+create ()
 	CODE:
+        RETVAL = player::create ();
+	OUTPUT:
+        RETVAL
+player *
+load (const char *path)
+	CODE:
+        RETVAL = player::load (path);
+	OUTPUT:
+        RETVAL
+void
+player::save (bool final = false)
+void
+player::connect (client *ns)
+void
+save_stats (player *pl)
+	CODE:
+        pl->ob->stats.hp    = pl->ob->stats.maxhp;
+        pl->ob->stats.sp    = pl->ob->stats.maxsp;
+        pl->ob->stats.grace = pl->ob->stats.maxgrace;
+        pl->orig_stats      = pl->ob->stats;
+player *cf_player_find (char *name)
+	PROTOTYPE: $
+void cf_player_move (player *pl, int dir)
+void play_sound_player_only (player *pl, int soundnum, int x = 0, int y = 0);
+player *first ()
+	CODE:
-        RETVAL = registry_of (pl);
+        RETVAL = first_player;
+        OUTPUT: RETVAL
+bool
+cell_visible (player *pl, int dx, int dy)
+	CODE:
+        RETVAL = FABS (dx) <= pl->ns->mapx / 2 && FABS (dy) <= pl->ns->mapy / 2
+                 && !pl->blocked_los [dx + pl->ns->mapx / 2][dy + pl->ns->mapy / 2];
         OUTPUT:
         RETVAL
-player *cf_player_find (char *name)
-	PROTOTYPE: $
-void cf_player_move (player *pl, int dir)
-void play_sound_player_only (player *pl, int soundnum, int x = 0, int y = 0);
-# nonstandard
-object *ob (player *pl)
-	CODE:
-        RETVAL = pl->ob;
-        OUTPUT: RETVAL
-player *first ()
-	CODE:
-        RETVAL = first_player;
-        OUTPUT: RETVAL
-player *next (player *pl)
-	CODE:
-        RETVAL = pl->next;
-        OUTPUT: RETVAL
-bool
-cell_visible (player *pl, int dx, int dy)
-	CODE:
-        RETVAL = FABS (dx) <= pl->socket.mapx / 2 && FABS (dy) <= pl->socket.mapy / 2
-                 && !pl->blocked_los [dx + pl->socket.mapx / 2][dy + pl->socket.mapy / 2];
-        OUTPUT:
-        RETVAL
-char *
-client (player *pl)
-	CODE:
-        RETVAL = pl->socket.client;
-        OUTPUT:
-        RETVAL
-char *
-host (player *pl)
-	CODE:
-        RETVAL = pl->socket.host;
-        OUTPUT:
-        RETVAL
-char *
-killer (player *pl, char *killer = 0)
-	CODE:
-        if (killer)
-          snprintf (pl->killer, sizeof (pl->killer), "%s", killer);
-        RETVAL = pl->killer;
-        OUTPUT:
-        RETVAL
-void
-buggy_mapscroll (player *pl, int value = 1)
-	CODE:
-        pl->socket.buggy_mapscroll = value;
 void
 send (player *pl, SV *packet)
 	CODE:
 {
 	STRLEN len;
 	char *buf = SvPVbyte (packet, len);
-        Write_String_To_Socket (&pl->socket, buf, len);
+        if (pl->ns)
+          pl->ns->send_packet (buf, len);
 }
 int
 listening (player *pl, int new_value = -1)
 	CODE:
         if (y)        sv_to (y,        pl->bed_y);
 void
 list ()
 	PPCODE:
-{
-	player *pl;
-        for (pl = first_player; pl; pl = pl->next)
+        for (player *pl = first_player; pl; pl = pl->next)
-          XPUSHs (newSVcfapi (CFAPI_PPLAYER, pl));
+          XPUSHs (sv_2mortal (to_sv (pl)));
-}
 bool
 peaceful (player *pl, bool new_setting = 0)
 	PROTOTYPE: $;$
         CODE:
         OUTPUT: RETVAL
 MODULE = cf        PACKAGE = cf::map            PREFIX = cf_map_
-mapstruct *first ()
+maptile *first ()
 	PROTOTYPE:
         CODE:
         RETVAL = first_map;
         OUTPUT: RETVAL
-int invoke (mapstruct *map, int event, ...)
+int invoke (maptile *map, int event, ...)
 	CODE:
         if (KLASS_OF (event) != KLASS_MAP) croak ("event class must be MAP");
 	AV *av = (AV *)sv_2mortal ((SV *)newAV ());
         for (int i = 2; i < items; i++) av_push (av, SvREFCNT_inc (ST (i)));
         RETVAL = INVOKE_((event_type)event, ARG_MAP (map), ARG_AV (av));
 	OUTPUT: RETVAL
-SV *registry (mapstruct *map)
+SV *registry (maptile *map)
-	CODE:
-        RETVAL = registry_of (map);
-        OUTPUT:
-        RETVAL
-INCLUDE: $PERL genacc mapstruct ../include/map.h |
+INCLUDE: $PERL genacc maptile ../include/map.h |
-mapstruct *new (int width, int height)
+maptile *new (int width, int height)
 	PROTOTYPE:
 	CODE:
 {
         RETVAL = get_empty_map (width, height);
 }
 	OUTPUT:
         RETVAL
-void delete_map (mapstruct *map)
+void delete_map (maptile *map)
-void clean_tmp_map (mapstruct *map)
+void clean_tmp_map (maptile *map)
-void play_sound_map (mapstruct *map, int x, int y, int sound_num)
+void play_sound_map (maptile *map, int x, int y, int sound_num)
+int out_of_map (maptile *map, int x, int y)
-mapstruct *tile_map (mapstruct *map, unsigned int dir)
+maptile *tile_map (maptile *map, unsigned int dir)
 	CODE:
         RETVAL = dir < 4 ? map->tile_map [dir] : 0;
 	OUTPUT:
         RETVAL
-char *tile_path (mapstruct *map, unsigned int dir)
+char *tile_path (maptile *map, unsigned int dir)
 	CODE:
         if (dir >= 4)
           XSRETURN_UNDEF;
         RETVAL = map->tile_path [dir];
 	OUTPUT:
         RETVAL
-mapstruct *ready_map_name (char *name, int flags = 0)
+maptile *ready_map_name (char *name, int flags = 0)
 	PROTOTYPE: $;$
 	ALIAS:
         find    = 0
         get_map = 1
-mapstruct *has_been_loaded (char *name)
+maptile *has_been_loaded (char *name)
 	PROTOTYPE: $
-int in_memory (mapstruct *map)
+int in_memory (maptile *map)
 	CODE:
         RETVAL = map->in_memory;
 	OUTPUT:
         RETVAL
 void
-trigger (mapstruct *map, long connection, bool state = true)
+trigger (maptile *map, long connection, bool state = true)
         CODE:
         activate_connection (map, connection, state);
 void
-get_connection (mapstruct *map, long connection)
+get_connection (maptile *map, long connection)
        PPCODE:
        oblinkpt *obp = get_connection_links (map, connection);
        if (obp)
          for (objectlink *ol = obp->link; ol; ol = ol->next)
-           XPUSHs (sv_2mortal (newSVcfapi (CFAPI_POBJECT, ol->ob)));
+           XPUSHs (sv_2mortal (newSVcfapi (CFAPI_POBJECT, (object *)ol->ob)));
-object *cf_map_insert_object_there (mapstruct *where, object *op, object *originator, int flags)
+object *cf_map_insert_object_there (maptile *where, object *op, object *originator, int flags)
-object *cf_map_insert_object (mapstruct *where, object* op, int x, int y)
+object *cf_map_insert_object (maptile *where, object* op, int x, int y)
-object* cf_map_present_arch_by_name (mapstruct *map, const char* str, int nx, int ny)
+object* cf_map_present_arch_by_name (maptile *map, const char* str, int nx, int ny)
         C_ARGS: str, map, nx, ny
 void
-cf_map_normalise (mapstruct *map, int x, int y)
+cf_map_normalise (maptile *map, int x, int y)
 	PPCODE:
 {
-        mapstruct *nmap = 0;
+        maptile *nmap = 0;
         I16 nx = 0, ny = 0;
         int flags = get_map_flags (map, &nmap, x, y, &nx, &ny);
         EXTEND (SP, 4);
         PUSHs (sv_2mortal (newSViv (flags)));
             PUSHs (sv_2mortal (newSViv (ny)));
           }
 }
 void
-at (mapstruct *map, unsigned int x, unsigned int y)
+at (maptile *map, unsigned int x, unsigned int y)
 	PROTOTYPE: $$$
         PPCODE:
 {
 	object *o;
-        mapstruct *nmap = 0;
+        maptile *nmap = 0;
         I16 nx, ny;
         get_map_flags (map, &nmap, x, y, &nx, &ny);
         if (nmap)
           for (o = GET_MAP_OB (nmap, nx, ny); o; o = o->above)
             XPUSHs (sv_2mortal (newSVcfapi (CFAPI_POBJECT, o)));
 }
 SV *
-bot_at (mapstruct *obj, unsigned int x, unsigned int y)
+bot_at (maptile *obj, unsigned int x, unsigned int y)
 	PROTOTYPE: $$$
         ALIAS:
           top_at        = 1
           flags_at      = 2
           light_at      = 3
             case 7: RETVAL = newSVuv    (               GET_MAP_MOVE_OFF   (obj, x, y)); break;
           }
         OUTPUT:
         RETVAL
+void fix_walls (maptile *map, int x, int y)
+void fix_walls_around (maptile *map, int x, int y)
 MODULE = cf        PACKAGE = cf::arch
 archetype *find (const char *name)
         CODE:
-        RETVAL = find_archetype (name);
+        RETVAL = archetype::find (name);
         OUTPUT:
 	RETVAL
 archetype *first()
 	PROTOTYPE:
 MODULE = cf        PACKAGE = cf::living
 INCLUDE: $PERL genacc living ../include/living.h |
+MODULE = cf        PACKAGE = cf::settings
+INCLUDE: $PERL genacc Settings ../include/global.h |
+MODULE = cf        PACKAGE = cf::client
+INCLUDE: $PERL genacc client ../include/client.h |
+int invoke (client *ns, int event, ...)
+	CODE:
+        if (KLASS_OF (event) != KLASS_CLIENT) croak ("event class must be CLIENT");
+	AV *av = (AV *)sv_2mortal ((SV *)newAV ());
+        for (int i = 2; i < items; i++) av_push (av, SvREFCNT_inc (ST (i)));
+        RETVAL = INVOKE_((event_type)event, ARG_CLIENT (ns), ARG_AV (av));
+	OUTPUT: RETVAL
+SV *registry (client *ns)
+void
+list ()
+	PPCODE:
+        EXTEND (SP, clients.size ());
+        for (sockvec::iterator i = clients.begin (); i != clients.end (); ++i)
+          PUSHs (sv_2mortal (to_sv (*i)));
+client *
+create (int fd, const char *peername)
+	CODE:
+        RETVAL = client::create (fd, peername);
+	OUTPUT:
+        RETVAL
+void
+client::send_packet (SV *packet)
+	CODE:
+{
+	STRLEN len;
+	char *buf = SvPVbyte (packet, len);
+        THIS->send_packet (buf, len);
+}
+void
+client::destroy ()

Diff Legend

-–
+Removed lines
-+
+Added lines
-<
+Changed lines
->
+Changed lines

Comparing deliantra/server/server/cfperl.xs (file contents): Revision 1.55 by root, Tue Sep 12 18:15:34 2006 UTC vs. Revision 1.106 by root, Sat Dec 23 15:49:40 2006 UTC

Diff Legend

Comparing deliantra/server/server/cfperl.xs (file contents):
Revision 1.55 by root, Tue Sep 12 18:15:34 2006 UTC vs.
Revision 1.106 by root, Sat Dec 23 15:49:40 2006 UTC