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

Comparing deliantra/server/socket/request.C (file contents):
Revision 1.51 by root, Fri Dec 22 16:34:00 2006 UTC vs.
Revision 1.59 by pippijn, Sat Jan 6 14:42:31 2007 UTC

 /*
     CrossFire, A Multiplayer game for X-windows
+    Copyright (C) 2005, 2006, 2007 Marc Lehmann & Crossfire+ Development Team
     Copyright (C) 2001 Mark Wedel
     Copyright (C) 1992 Frank Tore Johansen
     This program is free software; you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
                 flags |= 4;
               if (ob->map->tile_path[3])
                 flags |= 8;
               snprintf (buf, MAX_BUF, "mapinfo - spatial %d %d %d %d %d %s",
-                        flags, socket.mapx / 2 - ob->x, socket.mapy / 2 - ob->y, ob->map->width, ob->map->height, ob->map->path);
+                        flags, socket.mapx / 2 - ob->x, socket.mapy / 2 - ob->y, ob->map->width, ob->map->height, &ob->map->path);
             }
           else
             snprintf (buf, MAX_BUF, "mapinfo current");
           socket.send_packet (buf);
         {
           int dir = *buf++;
           switch (dir)
             {
-                case '1':
+              case '1':
-                  dx = 0;
+                dx = 0;
-                  dy = -1;
+                dy = -1;
-                  map = get_map_from_coord (map, &dx, &dy);
+                map = map->xy_find (dx, dy);
-                  map && (mapy -= map->height);
+                map && (mapy -= map->height);
-                  break;
+                break;
-                case '2':
+              case '2':
-                  mapx += map->width;
+                mapx += map->width;
-                  dx = map->width;
+                dx = map->width;
-                  dy = 0;
+                dy = 0;
-                  map = get_map_from_coord (map, &dx, &dy);
+                map = map->xy_find (dx, dy);
-                  break;
+                break;
-                case '3':
+              case '3':
-                  mapy += map->height;
+                mapy += map->height;
-                  dx = 0;
+                dx = 0;
-                  dy = map->height;
+                dy = map->height;
-                  map = get_map_from_coord (map, &dx, &dy);
+                map = map->xy_find (dx, dy);
-                  break;
+                break;
-                case '4':
+              case '4':
-                  dx = -1;
+                dx = -1;
-                  dy = 0;
+                dy = 0;
-                  map = get_map_from_coord (map, &dx, &dy);
+                map = map->xy_find (dx, dy);
-                  map && (mapx -= map->width);
+                map && (mapx -= map->width);
-                  break;
+                break;
             }
           --max_distance;
         }
           if (map->tile_path[2])
             flags |= 4;
           if (map->tile_path[3])
             flags |= 8;
-          snprintf (bigbuf, MAX_BUF, "mapinfo %s spatial %d %d %d %d %d %s", token, flags, mapx, mapy, map->width, map->height, map->path);
+          snprintf (bigbuf, MAX_BUF, "mapinfo %s spatial %d %d %d %d %d %s", token, flags, mapx, mapy, map->width, map->height, &map->path);
         }
       else
         snprintf (bigbuf, MAX_BUF, "mapinfo %s nomap", token);
     }
   else
         {
           ns->sound = atoi (param);
           safe_strcat (cmdback, param, &slen, HUGE_BUF);
         }
       else if (!strcmp (cmd, "exp64"))
-        {
-          ns->exp64 = atoi (param);
-          safe_strcat (cmdback, param, &slen, HUGE_BUF);
+        safe_strcat (cmdback, param, &slen, HUGE_BUF);
-        }
       else if (!strcmp (cmd, "spellmon"))
         {
           ns->monitor_spells = atoi (param);
           safe_strcat (cmdback, param, &slen, HUGE_BUF);
         }
 {
   ns->sound = atoi (buf);
 }
 /** client wants the map resent */
 void
 MapRedrawCmd (char *buf, int len, player *pl)
 {
 /* This function is currently disabled; just clearing the map state results in
  * display errors. It should clear the cache and send a newmap command.
 void
 esrv_update_stats (player *pl)
 {
   char buf[MAX_BUF];
   uint16 flags;
+  if (!pl->ns)
+    return;
   packet sl ("stats");
   if (pl->ob)
     {
       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->ns->exp64)
-    for (int s = 0; s < NUM_SKILLS; s++)
+  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)
+    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
+        /* Always send along the level if exp changes.  This is only
-           * 1 extra byte, but keeps processing simpler.
+         * 1 extra byte, but keeps processing simpler.
-           */
+         */
-          sl << uint8 (s + CS_STAT_SKILLINFO)
+        sl << uint8 (s + CS_STAT_SKILLINFO)
-             << uint8 (pl->last_skill_ob[s]->level)
+           << uint8 (pl->last_skill_ob[s]->level)
-             << uint64 (pl->last_skill_ob[s]->stats.exp);
+           << uint64 (pl->last_skill_ob[s]->stats.exp);
-          pl->last_skill_exp[s] = pl->last_skill_ob[s]->stats.exp;
+        pl->last_skill_exp[s] = pl->last_skill_ob[s]->stats.exp;
-        }
+      }
-  if (pl->ns->exp64)
-    { AddIfInt64 (pl->last_stats.exp, pl->ob->stats.exp, CS_STAT_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);
   AddIfShort (pl->last_stats.wc, pl->ob->stats.wc, CS_STAT_WC);
   AddIfShort (pl->last_stats.ac, pl->ob->stats.ac, CS_STAT_AC);
   AddIfShort (pl->last_stats.dam, pl->ob->stats.dam, CS_STAT_DAM);
   AddIfFloat (pl->last_speed, pl->ob->speed, CS_STAT_SPEED);
   ob = GET_MAP_FACE_OBJ (mp, mx, my, layer);
   /* If there is no object for this space, or if the face for the object
    * is the blank face, set the smoothlevel to zero.
    */
-  if (!ob || ob->face == blank_face || MAP_NOSMOOTH (mp))
+  if (!ob || ob->face == blank_face)
     smoothlevel = 0;
   else
     {
       smoothlevel = ob->smoothlevel;
       if (smoothlevel && !(ns.faces_sent[ob->face->number] & NS_FACESENT_SMOOTH))
   uint8 extendedinfos;
   maptile *m;
   client &socket = *pl->contr->ns;
+  if (!pl->active ())
+    return;
   check_map_change (pl->contr);
   packet sl (socket.mapmode == Map1Cmd ? "map1" : "map1a");
   packet esl;
                   map_clearcell (&lastcell, 0, 0, 0, -1);
                 }
             }
           else if (d > 3)
             {
+              m->touch ();
               int need_send = 0, count;
               /* This block deals with spaces that are not visible for whatever
                * reason.  Still may need to send the head for this space.
                */
               else
                 sl.reset (oldlen);
             }
           else
             {
+              m->touch ();
               /* In this block, the space is visible or there are head objects
                * we need to send.
                */
               /* Rather than try to figure out what everything that we might
  * 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;
   if (!pl->ns->monitor_spells)
     return;
   for (object *spell = pl->ob->inv; spell; spell = spell->below)
     {

Diff Legend

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

Comparing deliantra/server/socket/request.C (file contents): Revision 1.51 by root, Fri Dec 22 16:34:00 2006 UTC vs. Revision 1.59 by pippijn, Sat Jan 6 14:42:31 2007 UTC

Diff Legend

Comparing deliantra/server/socket/request.C (file contents):
Revision 1.51 by root, Fri Dec 22 16:34:00 2006 UTC vs.
Revision 1.59 by pippijn, Sat Jan 6 14:42:31 2007 UTC