| … | |
… | |
| 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 |
| … | |
… | |
| 914 | { |
914 | { |
| 915 | ns->sound = atoi (buf); |
915 | ns->sound = atoi (buf); |
| 916 | } |
916 | } |
| 917 | |
917 | |
| 918 | /** client wants the map resent */ |
918 | /** client wants the map resent */ |
| 919 | |
|
|
| 920 | void |
919 | void |
| 921 | MapRedrawCmd (char *buf, int len, player *pl) |
920 | MapRedrawCmd (char *buf, int len, player *pl) |
| 922 | { |
921 | { |
| 923 | /* This function is currently disabled; just clearing the map state results in |
922 | /* This function is currently disabled; just clearing the map state results in |
| 924 | * display errors. It should clear the cache and send a newmap command. |
923 | * display errors. It should clear the cache and send a newmap command. |
| … | |
… | |
| 1506 | ob = GET_MAP_FACE_OBJ (mp, mx, my, layer); |
1505 | ob = GET_MAP_FACE_OBJ (mp, mx, my, layer); |
| 1507 | |
1506 | |
| 1508 | /* If there is no object for this space, or if the face for the object |
1507 | /* 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. |
1508 | * is the blank face, set the smoothlevel to zero. |
| 1510 | */ |
1509 | */ |
| 1511 | if (!ob || ob->face == blank_face || mp->nosmooth) |
1510 | if (!ob || ob->face == blank_face) |
| 1512 | smoothlevel = 0; |
1511 | smoothlevel = 0; |
| 1513 | else |
1512 | else |
| 1514 | { |
1513 | { |
| 1515 | smoothlevel = ob->smoothlevel; |
1514 | smoothlevel = ob->smoothlevel; |
| 1516 | if (smoothlevel && !(ns.faces_sent[ob->face->number] & NS_FACESENT_SMOOTH)) |
1515 | if (smoothlevel && !(ns.faces_sent[ob->face->number] & NS_FACESENT_SMOOTH)) |
| … | |
… | |
| 1718 | map_clearcell (&lastcell, 0, 0, 0, -1); |
1717 | map_clearcell (&lastcell, 0, 0, 0, -1); |
| 1719 | } |
1718 | } |
| 1720 | } |
1719 | } |
| 1721 | else if (d > 3) |
1720 | else if (d > 3) |
| 1722 | { |
1721 | { |
|
|
1722 | m->touch (); |
|
|
1723 | |
| 1723 | int need_send = 0, count; |
1724 | int need_send = 0, count; |
| 1724 | |
1725 | |
| 1725 | /* This block deals with spaces that are not visible for whatever |
1726 | /* This block deals with spaces that are not visible for whatever |
| 1726 | * reason. Still may need to send the head for this space. |
1727 | * reason. Still may need to send the head for this space. |
| 1727 | */ |
1728 | */ |
| … | |
… | |
| 1760 | else |
1761 | else |
| 1761 | sl.reset (oldlen); |
1762 | sl.reset (oldlen); |
| 1762 | } |
1763 | } |
| 1763 | else |
1764 | else |
| 1764 | { |
1765 | { |
|
|
1766 | m->touch (); |
|
|
1767 | |
| 1765 | /* In this block, the space is visible or there are head objects |
1768 | /* In this block, the space is visible or there are head objects |
| 1766 | * we need to send. |
1769 | * we need to send. |
| 1767 | */ |
1770 | */ |
| 1768 | |
1771 | |
| 1769 | /* Rather than try to figure out what everything that we might |
1772 | /* Rather than try to figure out what everything that we might |
