[ViewVC] Diff of: cvs/deliantra/server/socket/request.C

Comparing deliantra/server/socket/request.C (file contents):
Revision 1.49 by root, Thu Dec 21 06:12:37 2006 UTC vs.
Revision 1.51 by root, Fri Dec 22 16:34:00 2006 UTC

 }
 static void
 clear_map (player *pl)
 {
-  memset (&pl->socket->lastmap, 0, sizeof (pl->socket->lastmap));
+  memset (&pl->ns->lastmap, 0, sizeof (pl->ns->lastmap));
-  if (pl->socket->newmapcmd == 1)
+  if (pl->ns->newmapcmd == 1)
-    pl->socket->send_packet ("newmap");
+    pl->ns->send_packet ("newmap");
-  pl->socket->floorbox_reset ();
+  pl->ns->floorbox_reset ();
 }
 /** check for map change and send new map data */
 static void
 check_map_change (player *pl)
 {
-  client &socket = *pl->socket;
+  client &socket = *pl->ns;
   object *ob = pl->ob;
   char buf[MAX_BUF];            /* eauugggh */
   if (socket.current_map != ob->map)
     {
       buf += 8;
       // initial map and its origin
       maptile *map = pl->ob->map;
       sint16 dx, dy;
-      int mapx = pl->socket->mapx / 2 - pl->ob->x;
+      int mapx = pl->ns->mapx / 2 - pl->ob->x;
-      int mapy = pl->socket->mapy / 2 - pl->ob->y;
+      int mapy = pl->ns->mapy / 2 - pl->ob->y;
       int max_distance = 8;     // limit maximum path length to something generous
       while (*buf && map && max_distance)
         {
           int dir = *buf++;
         snprintf (bigbuf, MAX_BUF, "mapinfo %s nomap", token);
     }
   else
     snprintf (bigbuf, MAX_BUF, "mapinfo %s unsupported", token);
-  pl->socket->send_packet (bigbuf);
+  pl->ns->send_packet (bigbuf);
 }
 /** This is the Setup cmd - easy first implementation */
 void
 SetUp (char *buf, int len, client * ns)
  * it either has to be here or init_sockets needs to be exported.
  */
 void
 AddMeCmd (char *buf, int len, client * ns)
 {
-  if (INVOKE_CLIENT (ADDME, ns))
+  INVOKE_CLIENT (ADDME, ns, ARG_DATA (buf, len));
-    return;
-  if (ns->pl || add_player (ns))
-    ns->send_packet ("addme_failed");
-  else
-    ns->send_packet ("addme_success");
 }
 /** Reply to ExtendedInfos command */
 void
 ToggleExtendedInfos (char *buf, int len, client * ns)
                 : time = (int) (MAX_TIME / FABS (pl->ob->speed));
   /* Send confirmation of command execution now */
   packet sl ("comc");
   sl << uint16 (cmdid) << uint32 (time);
-  pl->socket->send_packet (sl);
+  pl->ns->send_packet (sl);
 }
 /** This is a reply to a previous query. */
 void
 ReplyCmd (char *buf, int len, client *ns)
 {
+  if (ns->state == ST_CUSTOM)
+    {
+      INVOKE_CLIENT (REPLY, ns, ARG_DATA (buf, len));
+      return;
+    }
   if (!ns->pl)
     return; //TODO: depends on the exact reply we are after
             //TODO: but right now, we always have a ns->pl
   player *pl = ns->pl;
    */
   snprintf (pl->write_buf, sizeof (pl->write_buf), ":%s", buf);
   /* this avoids any hacking here */
-  switch (pl->state)
+  switch (ns->state)
     {
       case ST_PLAYING:
         LOG (llevError, "Got reply message with ST_PLAYING input state\n");
         break;
-      case ST_PLAY_AGAIN:
-        /* We can check this for return value (2==quit).  Maybe we
-         * should, and do something appropriate?
-         */
-        receive_play_again (pl->ob, buf[0]);
-        break;
-      case ST_ROLL_STAT:
-        key_roll_stat (pl->ob, buf[0]);
-        break;
       case ST_CHANGE_CLASS:
         key_change_class (pl->ob, buf[0]);
         break;
       case ST_CONFIRM_QUIT:
         key_confirm_quit (pl->ob, buf[0]);
         break;
-      case ST_CONFIGURE:
-        LOG (llevError, "In client input handling, but into configure state\n");
-        pl->state = ST_PLAYING;
-        break;
-      case ST_GET_NAME:
-        receive_player_name (pl->ob, 13);
-        break;
-      case ST_GET_PASSWORD:
-      case ST_CONFIRM_PASSWORD:
-        receive_player_password (pl->ob, 13);
-        break;
       case ST_GET_PARTY_PASSWORD:    /* Get password for party */
         receive_party_password (pl->ob, 13);
         break;
       default:
-        LOG (llevError, "Unknown input state: %d\n", pl->state);
+        LOG (llevError, "Unknown input state: %d\n", ns->state);
     }
 }
 /**
  * Client tells its version.  If there is a mismatch, we close the
       AddIfShort (pl->last_stats.sp, pl->ob->stats.sp, CS_STAT_SP);
       AddIfShort (pl->last_stats.maxsp, pl->ob->stats.maxsp, CS_STAT_MAXSP);
       AddIfShort (pl->last_stats.grace, pl->ob->stats.grace, CS_STAT_GRACE);
       AddIfShort (pl->last_stats.maxgrace, pl->ob->stats.maxgrace, CS_STAT_MAXGRACE);
       AddIfShort (pl->last_stats.Str, pl->ob->stats.Str, CS_STAT_STR);
-      AddIfShort (pl->last_stats.Int, pl->ob->stats.Int, CS_STAT_INT);
-      AddIfShort (pl->last_stats.Pow, pl->ob->stats.Pow, CS_STAT_POW);
-      AddIfShort (pl->last_stats.Wis, pl->ob->stats.Wis, CS_STAT_WIS);
       AddIfShort (pl->last_stats.Dex, pl->ob->stats.Dex, CS_STAT_DEX);
       AddIfShort (pl->last_stats.Con, pl->ob->stats.Con, CS_STAT_CON);
+      AddIfShort (pl->last_stats.Int, pl->ob->stats.Int, CS_STAT_INT);
+      AddIfShort (pl->last_stats.Wis, pl->ob->stats.Wis, CS_STAT_WIS);
+      AddIfShort (pl->last_stats.Pow, pl->ob->stats.Pow, CS_STAT_POW);
       AddIfShort (pl->last_stats.Cha, pl->ob->stats.Cha, CS_STAT_CHA);
     }
-  if (pl->socket->exp64)
+  if (pl->ns->exp64)
     for (int s = 0; s < NUM_SKILLS; s++)
       if (pl->last_skill_ob[s] && pl->last_skill_exp[s] != pl->last_skill_ob[s]->stats.exp)
         {
           /* Always send along the level if exp changes.  This is only
            * 1 extra byte, but keeps processing simpler.
              << uint64 (pl->last_skill_ob[s]->stats.exp);
           pl->last_skill_exp[s] = pl->last_skill_ob[s]->stats.exp;
         }
-  if (pl->socket->exp64)
+  if (pl->ns->exp64)
     { AddIfInt64 (pl->last_stats.exp, pl->ob->stats.exp, CS_STAT_EXP64) }
   else
     { AddIfInt (pl->last_stats.exp, (int) pl->ob->stats.exp, CS_STAT_EXP) }
   AddIfShort (pl->last_level, (char) pl->ob->level, CS_STAT_LEVEL);
   if (pl->run_on)
     flags |= SF_RUNON;
   AddIfShort (pl->last_flags, flags, CS_STAT_FLAGS);
-  if (pl->socket->sc_version < 1025)
+  if (pl->ns->sc_version < 1025)
     { AddIfShort (pl->last_resist[ATNR_PHYSICAL], pl->ob->resist[ATNR_PHYSICAL], CS_STAT_ARMOUR) }
   else
     for (int i = 0; i < NROFATTACKS; i++)
       {
         /* Skip ones we won't send */
           continue;
         AddIfShort (pl->last_resist[i], pl->ob->resist[i], (char) atnr_cs_stat[i]);
       }
-  if (pl->socket->monitor_spells)
+  if (pl->ns->monitor_spells)
     {
       AddIfInt (pl->last_path_attuned, pl->ob->path_attuned, CS_STAT_SPELL_ATTUNE);
       AddIfInt (pl->last_path_repelled, pl->ob->path_repelled, CS_STAT_SPELL_REPEL);
       AddIfInt (pl->last_path_denied, pl->ob->path_denied, CS_STAT_SPELL_DENY);
     }
   rangetostring (pl->ob, buf);  /* we want use the new fire & run system in new client */
-  AddIfString (pl->socket->stats.range, buf, CS_STAT_RANGE);
+  AddIfString (pl->ns->stats.range, buf, CS_STAT_RANGE);
   set_title (pl->ob, buf);
-  AddIfString (pl->socket->stats.title, buf, CS_STAT_TITLE);
+  AddIfString (pl->ns->stats.title, buf, CS_STAT_TITLE);
   /* Only send it away if we have some actual data */
   if (sl.length () > 6)
-    pl->socket->send_packet (sl);
+    pl->ns->send_packet (sl);
 }
 /**
  * Tells the client that here is a player it should start using.
  */
   sl << uint32 (pl->ob->count)
      << uint32 (weight)
      << uint32 (pl->ob->face->number)
      << data8  (pl->ob->name);
-  pl->socket->send_packet (sl);
+  pl->ns->send_packet (sl);
   SET_FLAG (pl->ob, FLAG_CLIENT_SENT);
 }
 /**
  * Need to send an animation sequence to the client.
  * we need 2 bytes for coordinates and 2 bytes for faces, such a trade off
  * maps no sense.  Instead, we actually really only use 12 bits for coordinates,
  * and use the other 4 bits for other informatiion.   For full documentation
  * of what we send, see the doc/Protocol file.
  * I will describe internally what we do:
- * the socket->lastmap shows how the map last looked when sent to the client.
+ * the ns->lastmap shows how the map last looked when sent to the client.
  * in the lastmap structure, there is a cells array, which is set to the
  * maximum viewable size (As set in config.h).
  * in the cells, there are faces and a count value.
  * we use the count value to hold the darkness value.  If -1, then this space
  *   is not viewable.
   uint8 eentrysize;
   uint16 ewhatstart, ewhatflag;
   uint8 extendedinfos;
   maptile *m;
-  client &socket = *pl->contr->socket;
+  client &socket = *pl->contr->ns;
   check_map_change (pl->contr);
   packet sl (socket.mapmode == Map1Cmd ? "map1" : "map1a");
   packet esl;
   if (pm == NULL || pm->in_memory != MAP_IN_MEMORY)
     return;
   memset (&newmap, 0, sizeof (struct Map));
-  for (j = (pl->y - pl->contr->socket->mapy / 2); j < (pl->y + (pl->contr->socket->mapy + 1) / 2); j++)
+  for (j = (pl->y - pl->contr->ns->mapy / 2); j < (pl->y + (pl->contr->ns->mapy + 1) / 2); j++)
-    for (i = (pl->x - pl->contr->socket->mapx / 2); i < (pl->x + (pl->contr->socket->mapx + 1) / 2); i++)
+    for (i = (pl->x - pl->contr->ns->mapx / 2); i < (pl->x + (pl->contr->ns->mapx + 1) / 2); i++)
       {
         ax = i;
         ay = j;
         m = pm;
         mflags = get_map_flags (m, &m, ax, ay, &ax, &ay);
 /*****************************************************************************/
 void
 send_plugin_custom_message (object *pl, char *buf)
 {
-  pl->contr->socket->send_packet (buf);
+  pl->contr->ns->send_packet (buf);
 }
 /**
  * This sends the skill number to name mapping.  We ignore
  * the params - we always send the same info no matter what.
  * it then sends an updspell packet for each spell that has changed in this way
  */
 void
 esrv_update_spells (player *pl)
 {
-  if (!pl->socket->monitor_spells)
+  if (!pl->ns->monitor_spells)
     return;
   for (object *spell = pl->ob->inv; spell; spell = spell->below)
     {
       if (spell->type == SPELL)
               if (flags & UPD_SP_MANA  ) sl << uint16 (spell->last_sp);
               if (flags & UPD_SP_GRACE ) sl << uint16 (spell->last_grace);
               if (flags & UPD_SP_DAMAGE) sl << uint16 (spell->last_eat);
-              pl->socket->send_packet (sl);
+              pl->ns->send_packet (sl);
             }
         }
     }
 }
 void
 esrv_remove_spell (player *pl, object *spell)
 {
-  if (!pl->socket->monitor_spells)
+  if (!pl->ns->monitor_spells)
     return;
   if (!pl || !spell || spell->env != pl->ob)
     {
       LOG (llevError, "Invalid call to esrv_remove_spell");
   packet sl ("delspell");
   sl << uint32 (spell->count);
-  pl->socket->send_packet (sl);
+  pl->ns->send_packet (sl);
 }
 /* appends the spell *spell to the Socklist we will send the data to. */
 static void
 append_spell (player *pl, packet &sl, object *spell)
     {
       LOG (llevError, "esrv_add_spells, tried to add a spell to a NULL player");
       return;
     }
-  if (!pl->socket->monitor_spells)
+  if (!pl->ns->monitor_spells)
     return;
   packet sl ("addspell");
   if (!spell)
           if (spell->type != SPELL)
             continue;
           if (sl.length () >= (MAXSOCKBUF - (26 + strlen (spell->name) + (spell->msg ? strlen (spell->msg) : 0))))
             {
-              pl->socket->send_packet (sl);
+              pl->ns->send_packet (sl);
               sl.reset ();
               sl << "addspell ";
             }
       LOG (llevError, "Buffer overflow in esrv_add_spells!\n");
       fatal (0);
     }
   /* finally, we can send the packet */
-  pl->socket->send_packet (sl);
+  pl->ns->send_packet (sl);
 }

Diff Legend

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

Comparing deliantra/server/socket/request.C (file contents): Revision 1.49 by root, Thu Dec 21 06:12:37 2006 UTC vs. Revision 1.51 by root, Fri Dec 22 16:34:00 2006 UTC

Diff Legend

Comparing deliantra/server/socket/request.C (file contents):
Revision 1.49 by root, Thu Dec 21 06:12:37 2006 UTC vs.
Revision 1.51 by root, Fri Dec 22 16:34:00 2006 UTC