… | |
… | |
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); |
… | |
… | |
290 | { |
290 | { |
291 | int dir = *buf++; |
291 | int dir = *buf++; |
292 | |
292 | |
293 | switch (dir) |
293 | switch (dir) |
294 | { |
294 | { |
295 | case '1': |
295 | case '1': |
296 | dx = 0; |
296 | dx = 0; |
297 | dy = -1; |
297 | dy = -1; |
298 | map = get_map_from_coord (map, &dx, &dy); |
298 | map = map->xy_find (dx, dy); |
299 | map && (mapy -= map->height); |
299 | map && (mapy -= map->height); |
300 | break; |
300 | break; |
301 | case '2': |
301 | case '2': |
302 | mapx += map->width; |
302 | mapx += map->width; |
303 | dx = map->width; |
303 | dx = map->width; |
304 | dy = 0; |
304 | dy = 0; |
305 | map = get_map_from_coord (map, &dx, &dy); |
305 | map = map->xy_find (dx, dy); |
306 | break; |
306 | break; |
307 | case '3': |
307 | case '3': |
308 | mapy += map->height; |
308 | mapy += map->height; |
309 | dx = 0; |
309 | dx = 0; |
310 | dy = map->height; |
310 | dy = map->height; |
311 | map = get_map_from_coord (map, &dx, &dy); |
311 | map = map->xy_find (dx, dy); |
312 | break; |
312 | break; |
313 | case '4': |
313 | case '4': |
314 | dx = -1; |
314 | dx = -1; |
315 | dy = 0; |
315 | dy = 0; |
316 | map = get_map_from_coord (map, &dx, &dy); |
316 | map = map->xy_find (dx, dy); |
317 | map && (mapx -= map->width); |
317 | map && (mapx -= map->width); |
318 | break; |
318 | break; |
319 | } |
319 | } |
320 | |
320 | |
321 | --max_distance; |
321 | --max_distance; |
322 | } |
322 | } |
323 | |
323 | |
… | |
… | |
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 || MAP_NOSMOOTH (mp)) |
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)) |
… | |
… | |
1589 | uint8 extendedinfos; |
1588 | uint8 extendedinfos; |
1590 | maptile *m; |
1589 | maptile *m; |
1591 | |
1590 | |
1592 | client &socket = *pl->contr->ns; |
1591 | client &socket = *pl->contr->ns; |
1593 | |
1592 | |
|
|
1593 | if (!pl->active ()) |
|
|
1594 | return; |
|
|
1595 | |
1594 | check_map_change (pl->contr); |
1596 | check_map_change (pl->contr); |
1595 | |
1597 | |
1596 | packet sl (socket.mapmode == Map1Cmd ? "map1" : "map1a"); |
1598 | packet sl (socket.mapmode == Map1Cmd ? "map1" : "map1a"); |
1597 | packet esl; |
1599 | packet esl; |
1598 | |
1600 | |
… | |
… | |
1718 | map_clearcell (&lastcell, 0, 0, 0, -1); |
1720 | map_clearcell (&lastcell, 0, 0, 0, -1); |
1719 | } |
1721 | } |
1720 | } |
1722 | } |
1721 | else if (d > 3) |
1723 | else if (d > 3) |
1722 | { |
1724 | { |
|
|
1725 | m->touch (); |
|
|
1726 | |
1723 | int need_send = 0, count; |
1727 | int need_send = 0, count; |
1724 | |
1728 | |
1725 | /* This block deals with spaces that are not visible for whatever |
1729 | /* This block deals with spaces that are not visible for whatever |
1726 | * reason. Still may need to send the head for this space. |
1730 | * reason. Still may need to send the head for this space. |
1727 | */ |
1731 | */ |
… | |
… | |
1760 | else |
1764 | else |
1761 | sl.reset (oldlen); |
1765 | sl.reset (oldlen); |
1762 | } |
1766 | } |
1763 | else |
1767 | else |
1764 | { |
1768 | { |
|
|
1769 | m->touch (); |
|
|
1770 | |
1765 | /* In this block, the space is visible or there are head objects |
1771 | /* In this block, the space is visible or there are head objects |
1766 | * we need to send. |
1772 | * we need to send. |
1767 | */ |
1773 | */ |
1768 | |
1774 | |
1769 | /* Rather than try to figure out what everything that we might |
1775 | /* Rather than try to figure out what everything that we might |