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

Comparing deliantra/server/socket/request.C (file contents):
Revision 1.150 by root, Mon Oct 12 14:00:59 2009 UTC vs.
Revision 1.167 by root, Sat Apr 3 22:30:21 2010 UTC

 /*
  * This file is part of Deliantra, the Roguelike Realtime MMORPG.
  *
- * Copyright (©) 2005,2006,2007,2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
+ * Copyright (©) 2005,2006,2007,2008,2009,2010 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
- * Copyright (©) 2001,2007 Mark Wedel
+ * Copyright (©) 2001 Mark Wedel
- * Copyright (©) 1992,2007 Frank Tore Johansen
+ * Copyright (©) 1992 Frank Tore Johansen
  *
  * Deliantra is free software: you can redistribute it and/or modify it under
  * the terms of the Affero GNU General Public License as published by the
  * Free Software Foundation, either version 3 of the License, or (at your
  * option) any later version.
  * <http://www.gnu.org/licenses/>.
  *
  * The authors can be reached via e-mail to <support@deliantra.net>
  */
+//+GPL
 /**
  * \file
  * Client handling.
  *
  * \date 2003-12-02
  * 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.
+ */
+static 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.
+ */
+static 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.
    * commands.
    */
   pl->count = 0;
   //TODO: schmorp thinks whatever this calculates, it makes no sense at all
-  int time = fabs (pl->ob->speed) < 0.001
+  int time = pl->ob->has_active_speed ()
-                ? time = MAX_TIME * 100
-                : time = (int) (MAX_TIME / fabs (pl->ob->speed));
+             ? (int) (MAX_TIME / pl->ob->speed)
+             : MAX_TIME * 100;
   /* Send confirmation of command execution now */
   packet sl ("comc");
   sl << uint16 (cmdid) << uint32 (time);
   pl->ns->send_packet (sl);
  */
 static void
 rangetostring (player *pl, char *obuf)
 {
   dynbuf_text &buf = msg_dynbuf; buf.clear ();
+#if 0
+  // print ranged/chosen_skill etc. objects every call
+  printf ("%s %s => %s (%s)\n",
+          pl->ranged_ob ? &pl->ranged_ob->name : "-",
+          pl->combat_ob ? &pl->combat_ob->name : "-",
+          pl->ob->current_weapon ? &pl->ob->current_weapon->name : "-",
+          pl->ob->chosen_skill ? &pl->ob->chosen_skill->name : "-"
+          );
+#endif
   if (pl->ranged_ob)
     buf << " Range"  << (pl->ob->current_weapon == pl->ranged_ob ? "*" : "") << ": " << pl->ranged_ob->name;
   if (pl->combat_ob)
   AddIfInt64 (ns->last_stats.exp,  ob->stats.exp, CS_STAT_EXP64);
   AddIfShort (ns->last_level,      ob->level, CS_STAT_LEVEL);
   AddIfShort (ns->last_stats.wc,   ob->stats.wc, CS_STAT_WC);
   AddIfShort (ns->last_stats.ac,   ob->stats.ac, CS_STAT_AC);
   AddIfShort (ns->last_stats.dam,  ob->stats.dam, CS_STAT_DAM);
-  AddIfFloat (ns->last_speed,      ob->speed, CS_STAT_SPEED, 1.f/TICK);
+  AddIfFloat (ns->last_speed,      ob->speed, CS_STAT_SPEED, 1.f / TICK);
   AddIfShort (ns->last_stats.food, ob->stats.food, CS_STAT_FOOD);
-  AddIfFloat (ns->last_weapon_sp,  pl->weapon_sp, CS_STAT_WEAP_SP, 1.f/TICK);
+  AddIfFloat (ns->last_weapon_sp,  pl->weapon_sp, CS_STAT_WEAP_SP, 1.f / TICK);
   AddIfInt   (ns->last_weight_limit, weight_limit[ob->stats.Str], CS_STAT_WEIGHT_LIM);
   flags = 0;
   if (opl->fire_on)
   if (opl->run_on)
     flags |= SF_RUNON;
   AddIfShort (ns->last_flags, flags, CS_STAT_FLAGS);
-  if (ns->sc_version < 1025)
-    { AddIfShort (ns->last_resist[ATNR_PHYSICAL], ob->resist[ATNR_PHYSICAL], CS_STAT_ARMOUR) }
-  else
-    for (int i = 0; i < NROFATTACKS; i++)
+  for (int i = 0; i < NROFATTACKS; i++)
-      {
+    {
-        /* Skip ones we won't send */
+      /* Skip ones we won't send */
-        if (atnr_cs_stat[i] == -1)
+      if (atnr_cs_stat[i] == -1)
-          continue;
+        continue;
-        AddIfShort (ns->last_resist[i], ob->resist[i], atnr_cs_stat[i]);
+      AddIfShort (ns->last_resist[i], ob->resist[i], atnr_cs_stat[i]);
-      }
+    }
   if (pl->ns->monitor_spells)
     {
       AddIfInt (ns->last_path_attuned,  ob->path_attuned,  CS_STAT_SPELL_ATTUNE);
       AddIfInt (ns->last_path_repelled, ob->path_repelled, CS_STAT_SPELL_REPEL);
   /* 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 ();
   if (--distance)
-    for (int dir = 4; --dir; )
+    for (int dir = 4; dir--; )
       if (const shstr &path = map->tile_path [dir])
         if (maptile *&neigh = map->tile_map [dir])
           prefetch_surrounding_maps (neigh, distance);
         else
           neigh = maptile::find_async (path, map);
 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 ();
     }
             map_clearcell (&lastcell, -1);
           }
         continue;
       }
     int d = pl->blocked_los_uc (dx, dy);
     if (d > 3)
       {
         /* This block deals with spaces that are not visible for whatever
       socket.send_packet (sl);
       socket.sent_scroll = 0;
     }
 }
-/*****************************************************************************/
-/* GROS: The following one is used to allow a plugin to send a generic cmd to*/
-/* a player. Of course, the client need to know the command to be able to    */
-/* manage it !                                                               */
-/*****************************************************************************/
-void
-send_plugin_custom_message (object *pl, char *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.
- */
-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)
 {
   if (!pl->ns)
     return;
+  pl->ns->update_spells = false;
   if (!pl->ns->monitor_spells)
     return;
   for (object *spell = pl->ob->inv; spell; spell = spell->below)
-    {
-      if (spell->type == SPELL)
+    if (spell->type == SPELL)
-        {
+      {
-          int flags = 0;
+        int flags = 0;
+        int val;
-          /* check if we need to update it */
+        /* check if we need to update it */
-          if (spell->cached_sp != SP_level_spellpoint_cost (pl->ob, spell, SPELL_MANA))
+        val = SP_level_spellpoint_cost (pl->ob, spell, SPELL_MANA);
+        if (spell->cached_sp != val)
-            {
+          {
-              spell->cached_sp = SP_level_spellpoint_cost (pl->ob, spell, SPELL_MANA);
+            spell->cached_sp = val;
-              flags |= UPD_SP_MANA;
+            flags |= UPD_SP_MANA;
-            }
+          }
-          if (spell->cached_grace != SP_level_spellpoint_cost (pl->ob, spell, SPELL_GRACE))
+        val = SP_level_spellpoint_cost (pl->ob, spell, SPELL_GRACE);
+        if (spell->cached_grace != val)
-            {
+          {
-              spell->cached_grace = SP_level_spellpoint_cost (pl->ob, spell, SPELL_GRACE);
+            spell->cached_grace = val;
-              flags |= UPD_SP_GRACE;
+            flags |= UPD_SP_GRACE;
-            }
+          }
-          if (spell->cached_eat != spell->stats.dam + SP_level_dam_adjust (pl->ob, spell))
+        val = casting_level (pl->ob, spell);
+        if (spell->cached_eat != val)
-            {
+          {
-              spell->cached_eat = spell->stats.dam + SP_level_dam_adjust (pl->ob, spell);
+            spell->cached_eat = val;
-              flags |= UPD_SP_DAMAGE;
+            flags |= UPD_SP_LEVEL;
-            }
+          }
-          if (flags)
+        if (flags)
-            {
+          {
-              packet sl;
+            packet sl;
-              sl << "updspell "
+            sl << "updspell "
-                 << uint8 (flags)
+               << uint8 (flags)
-                 << uint32 (spell->count);
+               << uint32 (spell->count);
-              if (flags & UPD_SP_MANA  ) sl << uint16 (spell->cached_sp);
+            if (flags & UPD_SP_MANA ) sl << uint16 (spell->cached_sp);
-              if (flags & UPD_SP_GRACE ) sl << uint16 (spell->cached_grace);
+            if (flags & UPD_SP_GRACE) sl << uint16 (spell->cached_grace);
-              if (flags & UPD_SP_DAMAGE) sl << uint16 (spell->cached_eat);
+            if (flags & UPD_SP_LEVEL) sl << uint16 (spell->cached_eat);
-              pl->ns->send_packet (sl);
+            pl->ns->send_packet (sl);
-            }
+          }
-        }
+      }
-    }
 }
 void
 esrv_remove_spell (player *pl, object *spell)
 {
     }
   /* store costs and damage in the object struct, to compare to later */
   spell->cached_sp    = SP_level_spellpoint_cost (pl->ob, spell, SPELL_MANA);
   spell->cached_grace = SP_level_spellpoint_cost (pl->ob, spell, SPELL_GRACE);
-  spell->cached_eat   = spell->stats.dam + SP_level_dam_adjust (pl->ob, spell);
+  spell->cached_eat   = casting_level (pl->ob, spell);
   /* figure out which skill it uses, if it uses one */
   if (spell->skill)
     if (object *tmp = pl->find_skill (spell->skill))
       skill = tmp->subtype + CS_STAT_SKILLINFO;
   /* 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.150 by root, Mon Oct 12 14:00:59 2009 UTC vs. Revision 1.167 by root, Sat Apr 3 22:30:21 2010 UTC

Diff Legend

Comparing deliantra/server/socket/request.C (file contents):
Revision 1.150 by root, Mon Oct 12 14:00:59 2009 UTC vs.
Revision 1.167 by root, Sat Apr 3 22:30:21 2010 UTC