ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/deliantra/server/socket/request.C
(Generate patch)

Comparing deliantra/server/socket/request.C (file contents):
Revision 1.53 by root, Mon Dec 25 11:25:50 2006 UTC vs.
Revision 1.56 by root, Mon Jan 1 12:28:47 2007 UTC

176 flags |= 4; 176 flags |= 4;
177 if (ob->map->tile_path[3]) 177 if (ob->map->tile_path[3])
178 flags |= 8; 178 flags |= 8;
179 179
180 snprintf (buf, MAX_BUF, "mapinfo - spatial %d %d %d %d %d %s", 180 snprintf (buf, MAX_BUF, "mapinfo - spatial %d %d %d %d %d %s",
181 flags, socket.mapx / 2 - ob->x, socket.mapy / 2 - ob->y, ob->map->width, ob->map->height, ob->map->path); 181 flags, socket.mapx / 2 - ob->x, socket.mapy / 2 - ob->y, ob->map->width, ob->map->height, &ob->map->path);
182 } 182 }
183 else 183 else
184 snprintf (buf, MAX_BUF, "mapinfo current"); 184 snprintf (buf, MAX_BUF, "mapinfo current");
185 185
186 socket.send_packet (buf); 186 socket.send_packet (buf);
334 if (map->tile_path[2]) 334 if (map->tile_path[2])
335 flags |= 4; 335 flags |= 4;
336 if (map->tile_path[3]) 336 if (map->tile_path[3])
337 flags |= 8; 337 flags |= 8;
338 338
339 snprintf (bigbuf, MAX_BUF, "mapinfo %s spatial %d %d %d %d %d %s", token, flags, mapx, mapy, map->width, map->height, map->path); 339 snprintf (bigbuf, MAX_BUF, "mapinfo %s spatial %d %d %d %d %d %s", token, flags, mapx, mapy, map->width, map->height, &map->path);
340 } 340 }
341 else 341 else
342 snprintf (bigbuf, MAX_BUF, "mapinfo %s nomap", token); 342 snprintf (bigbuf, MAX_BUF, "mapinfo %s nomap", token);
343 } 343 }
344 else 344 else
1506 ob = GET_MAP_FACE_OBJ (mp, mx, my, layer); 1506 ob = GET_MAP_FACE_OBJ (mp, mx, my, layer);
1507 1507
1508 /* If there is no object for this space, or if the face for the object 1508 /* If there is no object for this space, or if the face for the object
1509 * is the blank face, set the smoothlevel to zero. 1509 * is the blank face, set the smoothlevel to zero.
1510 */ 1510 */
1511 if (!ob || ob->face == blank_face || MAP_NOSMOOTH (mp)) 1511 if (!ob || ob->face == blank_face)
1512 smoothlevel = 0; 1512 smoothlevel = 0;
1513 else 1513 else
1514 { 1514 {
1515 smoothlevel = ob->smoothlevel; 1515 smoothlevel = ob->smoothlevel;
1516 if (smoothlevel && !(ns.faces_sent[ob->face->number] & NS_FACESENT_SMOOTH)) 1516 if (smoothlevel && !(ns.faces_sent[ob->face->number] & NS_FACESENT_SMOOTH))
1718 map_clearcell (&lastcell, 0, 0, 0, -1); 1718 map_clearcell (&lastcell, 0, 0, 0, -1);
1719 } 1719 }
1720 } 1720 }
1721 else if (d > 3) 1721 else if (d > 3)
1722 { 1722 {
1723 m->touch ();
1724
1723 int need_send = 0, count; 1725 int need_send = 0, count;
1724 1726
1725 /* This block deals with spaces that are not visible for whatever 1727 /* This block deals with spaces that are not visible for whatever
1726 * reason. Still may need to send the head for this space. 1728 * reason. Still may need to send the head for this space.
1727 */ 1729 */
1760 else 1762 else
1761 sl.reset (oldlen); 1763 sl.reset (oldlen);
1762 } 1764 }
1763 else 1765 else
1764 { 1766 {
1767 m->touch ();
1768
1765 /* In this block, the space is visible or there are head objects 1769 /* In this block, the space is visible or there are head objects
1766 * we need to send. 1770 * we need to send.
1767 */ 1771 */
1768 1772
1769 /* Rather than try to figure out what everything that we might 1773 /* Rather than try to figure out what everything that we might

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines