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

Comparing deliantra/server/socket/request.C (file contents):
Revision 1.70 by root, Sun Mar 11 21:26:05 2007 UTC vs.
Revision 1.71 by root, Mon Mar 12 01:13:10 2007 UTC

    * complexities for the client, and probably doesn't make
    * that much difference in bandwidth.
    */
   mx = ns->mapx;
   my = ns->mapy;
-  if (ns->mapmode == Map1aCmd)
-    {
-      mx += MAX_HEAD_OFFSET;
-      my += MAX_HEAD_OFFSET;
-    }
   /* the x and y here are coordinates for the new map, i.e. if we moved
    * (dx,dy), newmap[x][y] = oldmap[x-dx][y-dy].  For this reason,
    * if the destination x or y coordinate is outside the viewable
    * area, we clear the values - otherwise, the old values
         }
       else if (!strcmp (cmd, "newmapcmd"))
         {
           ns->newmapcmd = atoi (param);
           safe_strcat (cmdback, param, &slen, HUGE_BUF);
-//        } else if (!strcmp(cmd,"plugincmd")) {
-//            ns->plugincmd = atoi(param);
-//          safe_strcat(cmdback, param, &slen, HUGE_BUF);
         }
       else if (!strcmp (cmd, "mapinfocmd"))
         {
           ns->mapinfocmd = atoi (param);
           safe_strcat (cmdback, "1", &slen, HUGE_BUF);
             if (*cp == 'x' || *cp == 'X')
               {
                 y = atoi (cp + 1);
                 break;
               }
           if (x < 9 || y < 9 || x > MAP_CLIENT_X || y > MAP_CLIENT_Y)
             {
               sprintf (tmpbuf, " %dx%d", MAP_CLIENT_X, MAP_CLIENT_Y);
               safe_strcat (cmdback, tmpbuf, &slen, HUGE_BUF);
             }
   ns->cs_version = atoi (buf);
   ns->sc_version = ns->cs_version;
   LOG (llevDebug, "connection from client <%s>\n", buf);
   //TODO: should log here just for statistics
   //if (VERSION_CS != ns->cs_version)
   //  unchecked;
  * holds the old values.
  * layer is the layer to update, with 2 being the floor and 0 the
  * top layer (this matches what the GET_MAP_FACE and GET_MAP_FACE_OBJ
  * take.
  */
 static inline int
 update_smooth (packet &sl, client &ns, maptile *mp, int mx, int my, int sx, int sy, int layer)
 {
   object *ob;
   int smoothlevel;              /* old face_num; */
    * but that started to get a bit messy to look at.
    */
   max_x = pl->x + (socket.mapx + 1) / 2;
   max_y = pl->y + (socket.mapy + 1) / 2;
-  if (socket.mapmode == Map1aCmd)
-    {
-      max_x += MAX_HEAD_OFFSET;
-      max_y += MAX_HEAD_OFFSET;
-    }
   for (y = pl->y - socket.mapy / 2; y < max_y; y++, ay++)
     {
       ax = 0;
       for (x = pl->x - socket.mapx / 2; x < max_x; x++, ax++)
         {
           emask = mask = (ax & 0x3f) << 10 | (ay & 0x3f) << 4;
-          /* If this space is out of the normal viewable area, we only check
-           * the heads value  ax or ay will only be greater than what
-           * the client wants if using the map1a command - this is because
-           * if the map1a command is not used, max_x and max_y will be
-           * set to lower values.
-           */
-          if (ax >= socket.mapx || ay >= socket.mapy)
-            {
-              int i, got_one;
-              oldlen = sl.length ();
-              sl << uint16 (mask);
-              /* If all we are doing is sending 0 (blank) faces, we don't
-               * actually need to send that - just the coordinates
-               * with no faces tells the client to blank out the
-               * space.
-               */
-              got_one = 0;
-              for (i = oldlen + 2; i < sl.length (); i++)
-                if (sl[i])
-                  got_one = 1;
-              if (got_one && (mask & 0xf))
-                sl[oldlen + 1] = mask & 0xff;
-              else
-                {               /*either all faces blank, either no face at all */
-                  if (mask & 0xf)       /*at least 1 face, we know it's blank, only send coordinates */
-                    sl.reset (oldlen + 2);
-                  else
-                    sl.reset (oldlen);
-                }
-              /*What concerns extendinfos, nothing to be done for now
-               * (perhaps effects layer later)
-               */
-              continue;         /* don't do processing below */
-            }
           MapCell &lastcell = socket.lastmap.cells[ax][ay];
           d = pl->contr->blocked_los[ax][ay];
               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.
+               * reason. Still may need to send the head for this space.
                */
               oldlen = sl.length ();
               sl << uint16 (mask);
             }
           else
             {
               m->touch ();
-              /* In this block, the space is visible or there are head objects
+              /* In this block, the space is visible.
-               * we need to send.
                */
               /* Rather than try to figure out what everything that we might
                * need to send is, then form the packet after that,
                * we presume that we will in fact form a packet, and update

Diff Legend

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

Comparing deliantra/server/socket/request.C (file contents): Revision 1.70 by root, Sun Mar 11 21:26:05 2007 UTC vs. Revision 1.71 by root, Mon Mar 12 01:13:10 2007 UTC

Diff Legend

Comparing deliantra/server/socket/request.C (file contents):
Revision 1.70 by root, Sun Mar 11 21:26:05 2007 UTC vs.
Revision 1.71 by root, Mon Mar 12 01:13:10 2007 UTC