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

Comparing deliantra/server/socket/request.C (file contents):
Revision 1.149 by root, Mon Apr 27 01:38:49 2009 UTC vs.
Revision 1.157 by root, Fri Nov 6 13:05:57 2009 UTC

  *
  * Copyright (©) 2005,2006,2007,2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
  * Copyright (©) 2001,2007 Mark Wedel
  * Copyright (©) 1992,2007 Frank Tore Johansen
  *
- * Deliantra is free software: you can redistribute it and/or modify
+ * Deliantra is free software: you can redistribute it and/or modify it under
- * it under the terms of the GNU General Public License as published by
+ * the terms of the Affero GNU General Public License as published by the
- * the Free Software Foundation, either version 3 of the License, or
+ * Free Software Foundation, either version 3 of the License, or (at your
- * (at your option) any later version.
+ * option) any later version.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
  * GNU General Public License for more details.
  *
- * You should have received a copy of the GNU General Public License
+ * You should have received a copy of the Affero GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ * and the GNU General Public License along with this program. If not, see
+ * <http://www.gnu.org/licenses/>.
  *
  * The authors can be reached via e-mail to <support@deliantra.net>
  */
+//+GPL
 /**
  * \file
  * Client handling.
  *
  * This table translates the attack numbers as used within the
  * program to the value we use when sending STATS command to the
  * client.  If a value is -1, then we don't send that to the
  * client.
  */
-short atnr_cs_stat[NROFATTACKS] = { CS_STAT_RES_PHYS,
+static short atnr_cs_stat[NROFATTACKS] = { CS_STAT_RES_PHYS,
   CS_STAT_RES_MAG, CS_STAT_RES_FIRE, CS_STAT_RES_ELEC,
   CS_STAT_RES_COLD, CS_STAT_RES_CONF, CS_STAT_RES_ACID,
   CS_STAT_RES_DRAIN, -1 /* weaponmagic */ ,
   CS_STAT_RES_GHOSTHIT, CS_STAT_RES_POISON,
   CS_STAT_RES_SLOW, CS_STAT_RES_PARA, CS_STAT_TURN_UNDEAD,
 static void
 send_map_info (player *pl)
 {
   client &socket = *pl->ns;
-  object *ob = pl->observe;
+  object *ob = pl->viewpoint;
   if (socket.mapinfocmd)
     {
       if (ob->map && ob->map->path[0])
         {
 /** check for map/region change and send new map data */
 static void
 check_map_change (player *pl)
 {
   client &socket = *pl->ns;
-  object *ob = pl->observe;
+  object *ob = pl->viewpoint;
   region *reg = ob->region ();
   if (socket.current_region != reg)
     {
       INVOKE_PLAYER (REGION_CHANGE, pl, ARG_REGION (reg), ARG_REGION (socket.current_region));
       socket.floorbox_reset ();
     }
   socket.current_x = ob->x;
   socket.current_y = ob->y;
+}
+/**
+ * This sends the skill number to name mapping.  We ignore
+ * the params - we always send the same info no matter what.
+ */
+void
+send_skill_info (client *ns, char *params)
+{
+  packet sl;
+  sl << "replyinfo skill_info\n";
+  for (int i = 1; i < NUM_SKILLS; i++)
+    sl.printf ("%d:%s\n", i + CS_STAT_SKILLINFO, &skill_names [i]);
+  if (sl.length () > MAXSOCKBUF)
+    {
+      LOG (llevError, "Buffer overflow in send_skill_info!\n");
+      fatal (0);
+    }
+  ns->send_packet (sl);
+}
+/**
+ * This sends the spell path to name mapping.  We ignore
+ * the params - we always send the same info no matter what.
+ */
+void
+send_spell_paths (client * ns, char *params)
+{
+  packet sl;
+  sl << "replyinfo spell_paths\n";
+  for (int i = 0; i < NRSPELLPATHS; i++)
+    sl.printf ("%d:%s\n", 1 << i, spellpathnames[i]);
+  if (sl.length () > MAXSOCKBUF)
+    {
+      LOG (llevError, "Buffer overflow in send_spell_paths!\n");
+      fatal (0);
+    }
+  ns->send_packet (sl);
 }
 /**
  * RequestInfo is sort of a meta command. There is some specific
  * request of information, but we call other functions to provide
       {
         *params++ = 0;
         break;
       }
-  if (!strcmp (buf, "image_info"))
-    send_image_info (ns, params);
-  else if (!strcmp (buf, "image_sums"))
-    send_image_sums (ns, params);
-  else if (!strcmp (buf, "skill_info"))
+  if (!strcmp (buf, "skill_info"))
     send_skill_info (ns, params);
   else if (!strcmp (buf, "spell_paths"))
     send_spell_paths (ns, params);
   else
     {
 ExtiCmd (char *buf, int len, client *ns)
 {
   INVOKE_CLIENT (EXTICMD, ns, ARG_DATA (buf, len));
 }
+//-GPL
 void
 client::mapinfo_queue_clear ()
 {
   for (auto (i, mapinfo_queue.begin ()); i != mapinfo_queue.end (); ++i)
     free (*i);
 {
   char *token = buf;
   buf += strlen (buf) + 9;
   // initial map and its origin
-  maptile *map = pl->observe->map;
+  maptile *map = pl->viewpoint->map;
-  int mapx = pl->ns->mapx / 2 - pl->observe->x;
+  int mapx = pl->ns->mapx / 2 - pl->viewpoint->x;
-  int mapy = pl->ns->mapy / 2 - pl->observe->y;
+  int mapy = pl->ns->mapy / 2 - pl->viewpoint->y;
   int max_distance = 8;     // limit maximum path length to something generous
   while (*buf && map && max_distance)
     {
       int dir = *buf++ - '1';
 AddMeCmd (char *buf, int len, client *ns)
 {
   INVOKE_CLIENT (ADDME, ns, ARG_DATA (buf, len));
 }
+//+GPL
 /*
 #define MSG_TYPE_BOOK            1
 #define MSG_TYPE_CARD            2
 #define MSG_TYPE_PAPER           3
 #define MSG_TYPE_SIGN            4
   while (1)
     {
       /* 1. Extract an info */
       info = nextinfo;
-      while ((info < len) && (buf[info] == ' '))
+      while ((info < len) && (buf [info] == ' '))
         info++;
       if (info >= len)
         break;
       nextinfo = info + 1;
-      while ((nextinfo < len) && (buf[nextinfo] != ' '))
+      while ((nextinfo < len) && (buf [nextinfo] != ' '))
         nextinfo++;
       if (nextinfo - info >= 49)        /*Erroneous info asked */
         continue;
-      strncpy (command, &(buf[info]), nextinfo - info);
+      memcpy (command, buf + info, nextinfo - info);
-      command[nextinfo - info] = '\0';
+      command [nextinfo - info] = 0;
       /* 2. Interpret info */
       i = sscanf (command, "%d", &flag);
       if ((i == 1) && (flag > 0) && (flag <= MSG_TYPE_LAST))
         ns->supported_readables |= (1 << flag);
         return;
       buf++;
     }
-  execute_newserver_command (pl->ob, (char *) buf);
+  execute_newserver_command (pl->ob, (char *)buf);
   /* Perhaps something better should be done with a left over count.
    * Cleaning up the input should probably be done first - all actions
    * for the command that issued the count should be done before any other
    * commands.
   /* Nothing changed */
   return 0;
 }
+//-GPL
 // prefetch (and touch) all maps within a specific distancd
 static void
 prefetch_surrounding_maps (maptile *map, int distance)
 {
   map->touch ();
 prefetch_surrounding_maps (object *op)
 {
   prefetch_surrounding_maps (op->map, 3);
 }
+//+GPL
 /**
  * Draws client map.
  */
 void
 draw_client_map (player *pl)
 {
-  object *ob = pl->observe;
+  object *ob = pl->viewpoint;
-  if (!ob->active)
+  if (!pl->observe->active)
     return;
   /* If player is just joining the game, he isn't here yet, so the map
    * can get swapped out.  If so, don't try to send them a map.  All will
    * be OK once they really log in.
   check_map_change (pl);
   prefetch_surrounding_maps (pl->ob);
   /* do LOS after calls to update_position */
   /* unfortunately, we need to udpate los when observing, currently */
-  if (pl->do_los || pl->observe != pl->ob)
+  if (pl->do_los || pl->viewpoint != pl->ob)
     {
       pl->do_los = 0;
       pl->update_los ();
     }
 {
   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.
- */
-void
-send_skill_info (client *ns, char *params)
-{
-  packet sl;
-  sl << "replyinfo skill_info\n";
-  for (int i = 1; i < NUM_SKILLS; i++)
-    sl.printf ("%d:%s\n", i + CS_STAT_SKILLINFO, &skill_names [i]);
-  if (sl.length () > MAXSOCKBUF)
-    {
-      LOG (llevError, "Buffer overflow in send_skill_info!\n");
-      fatal (0);
-    }
-  ns->send_packet (sl);
-}
-/**
- * This sends the spell path to name mapping.  We ignore
- * the params - we always send the same info no matter what.
- */
-void
-send_spell_paths (client * ns, char *params)
-{
-  packet sl;
-  sl << "replyinfo spell_paths\n";
-  for (int i = 0; i < NRSPELLPATHS; i++)
-    sl.printf ("%d:%s\n", 1 << i, spellpathnames[i]);
-  if (sl.length () > MAXSOCKBUF)
-    {
-      LOG (llevError, "Buffer overflow in send_spell_paths!\n");
-      fatal (0);
-    }
-  ns->send_packet (sl);
-}
-/**
  * This looks for any spells the player may have that have changed their stats.
  * it then sends an updspell packet for each spell that has changed in this way
  */
 void
 esrv_update_spells (player *pl)
   /* finally, we can send the packet */
   pl->ns->flush_fx ();
   pl->ns->send_packet (sl);
 }
+//-GPL

Diff Legend

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

Comparing deliantra/server/socket/request.C (file contents): Revision 1.149 by root, Mon Apr 27 01:38:49 2009 UTC vs. Revision 1.157 by root, Fri Nov 6 13:05:57 2009 UTC

Diff Legend

Comparing deliantra/server/socket/request.C (file contents):
Revision 1.149 by root, Mon Apr 27 01:38:49 2009 UTC vs.
Revision 1.157 by root, Fri Nov 6 13:05:57 2009 UTC