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

Comparing deliantra/server/server/cfperl.xs (file contents):
Revision 1.85 by root, Sat Dec 16 03:08:26 2006 UTC vs.
Revision 1.100 by root, Fri Dec 22 02:04:21 2006 UTC

 static f_plug_api object_set_property = cfapi_object_set_property;
 static f_plug_api object_insert       = cfapi_object_insert;
 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;
 //////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
 static SV *
 newSVptr (void *ptr, const char *klass, HV *hv = newHV ())
       case DT_MAP:
         // va_arg (object *) when void * is passed is an XSI extension
         sv = to_sv (va_arg (ap, maptile *));
         break;
-      case DT_SOCKET:
+      case DT_CLIENT:
         sv = to_sv (va_arg (ap, client *));
         break;
       case DT_PLAYER:
         sv = to_sv (va_arg (ap, player *));
   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>
   AV *callbacks = 0;
   object *op;
   player *pl;
   maptile *map;
+  client *ns;
   // callback call ordering is:
   // 1. per-object callback
   // 2. per-class object
   // 3. per-type callback
           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));
     }
   // short-circuit processing if no callbacks found/defined
   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 (;;)
     {
     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 (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_PLAY_AGAIN)
+    const_iv (ST_ROLL_STAT)
+    const_iv (ST_CHANGE_CLASS)
+    const_iv (ST_CONFIRM_QUIT)
+    const_iv (ST_CONFIGURE)
+    const_iv (ST_GET_NAME)
+    const_iv (ST_GET_PASSWORD)
+    const_iv (ST_CONFIRM_PASSWORD)
+    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));
 void _init_vars ()
 	CODE:
         cb_global  = get_av ("cf::CB_GLOBAL", 1);
         cb_object  = get_av ("cf::CB_OBJECT", 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_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 (maptile *map = first_map; map; map = map->next)
           reattach (map);
         for (object *op = object::first; op; op = op->next)
           reattach (op);
 }
-bool
-add_client (int fd, const char *peername)
 NV floor (NV x)
 NV ceil (NV x)
           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
 	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)));
 }
 object *find_best_object_match (object *op, const char *match)
 object *find_marked_object (object *op)
 void remove (object *op)
 	CODE:
         op->remove ();
-void destroy (object *op, int recursive = 0)
+void
-	CODE:
+object::destroy (int recursive = 0)
-        op->destroy (recursive);
 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)
 base_name (object *op, int plural = op->nrof > 1)
         CODE:
         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
 bool
 cell_visible (player *pl, int dx, int dy)
 	CODE:
-        RETVAL = FABS (dx) <= pl->socket->mapx / 2 && FABS (dy) <= pl->socket->mapy / 2
+        RETVAL = FABS (dx) <= pl->ns->mapx / 2 && FABS (dy) <= pl->ns->mapy / 2
-                 && !pl->blocked_los [dx + pl->socket->mapx / 2][dy + pl->socket->mapy / 2];
+                 && !pl->blocked_los [dx + pl->ns->mapx / 2][dy + pl->ns->mapy / 2];
         OUTPUT:
         RETVAL
 void
 send (player *pl, SV *packet)
 	CODE:
 {
 	STRLEN len;
 	char *buf = SvPVbyte (packet, len);
+        if (pl->ns)
-        pl->socket->send_packet (buf, len);
+          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:
 INCLUDE: $PERL genacc client ../include/client.h |
 int invoke (client *ns, int event, ...)
 	CODE:
-        if (KLASS_OF (event) != KLASS_SOCKET) croak ("event class must be SOCKET");
+        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_SOCKET (ns), ARG_AV (av));
+        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.85 by root, Sat Dec 16 03:08:26 2006 UTC vs. Revision 1.100 by root, Fri Dec 22 02:04:21 2006 UTC

Diff Legend

Comparing deliantra/server/server/cfperl.xs (file contents):
Revision 1.85 by root, Sat Dec 16 03:08:26 2006 UTC vs.
Revision 1.100 by root, Fri Dec 22 02:04:21 2006 UTC