… | |
… | |
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. |
… | |
… | |
1010 | void |
1009 | void |
1011 | esrv_update_stats (player *pl) |
1010 | esrv_update_stats (player *pl) |
1012 | { |
1011 | { |
1013 | char buf[MAX_BUF]; |
1012 | char buf[MAX_BUF]; |
1014 | uint16 flags; |
1013 | uint16 flags; |
|
|
1014 | |
|
|
1015 | if (!pl->ns) |
|
|
1016 | return; |
1015 | |
1017 | |
1016 | packet sl ("stats"); |
1018 | packet sl ("stats"); |
1017 | |
1019 | |
1018 | if (pl->ob) |
1020 | if (pl->ob) |
1019 | { |
1021 | { |
… | |
… | |
1503 | ob = GET_MAP_FACE_OBJ (mp, mx, my, layer); |
1505 | ob = GET_MAP_FACE_OBJ (mp, mx, my, layer); |
1504 | |
1506 | |
1505 | /* 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 |
1506 | * is the blank face, set the smoothlevel to zero. |
1508 | * is the blank face, set the smoothlevel to zero. |
1507 | */ |
1509 | */ |
1508 | if (!ob || ob->face == blank_face || MAP_NOSMOOTH (mp)) |
1510 | if (!ob || ob->face == blank_face) |
1509 | smoothlevel = 0; |
1511 | smoothlevel = 0; |
1510 | else |
1512 | else |
1511 | { |
1513 | { |
1512 | smoothlevel = ob->smoothlevel; |
1514 | smoothlevel = ob->smoothlevel; |
1513 | if (smoothlevel && !(ns.faces_sent[ob->face->number] & NS_FACESENT_SMOOTH)) |
1515 | if (smoothlevel && !(ns.faces_sent[ob->face->number] & NS_FACESENT_SMOOTH)) |
… | |
… | |
1715 | map_clearcell (&lastcell, 0, 0, 0, -1); |
1717 | map_clearcell (&lastcell, 0, 0, 0, -1); |
1716 | } |
1718 | } |
1717 | } |
1719 | } |
1718 | else if (d > 3) |
1720 | else if (d > 3) |
1719 | { |
1721 | { |
|
|
1722 | m->touch (); |
|
|
1723 | |
1720 | int need_send = 0, count; |
1724 | int need_send = 0, count; |
1721 | |
1725 | |
1722 | /* This block deals with spaces that are not visible for whatever |
1726 | /* This block deals with spaces that are not visible for whatever |
1723 | * reason. Still may need to send the head for this space. |
1727 | * reason. Still may need to send the head for this space. |
1724 | */ |
1728 | */ |
… | |
… | |
1757 | else |
1761 | else |
1758 | sl.reset (oldlen); |
1762 | sl.reset (oldlen); |
1759 | } |
1763 | } |
1760 | else |
1764 | else |
1761 | { |
1765 | { |
|
|
1766 | m->touch (); |
|
|
1767 | |
1762 | /* 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 |
1763 | * we need to send. |
1769 | * we need to send. |
1764 | */ |
1770 | */ |
1765 | |
1771 | |
1766 | /* Rather than try to figure out what everything that we might |
1772 | /* Rather than try to figure out what everything that we might |
… | |
… | |
2081 | * it then sends an updspell packet for each spell that has changed in this way |
2087 | * it then sends an updspell packet for each spell that has changed in this way |
2082 | */ |
2088 | */ |
2083 | void |
2089 | void |
2084 | esrv_update_spells (player *pl) |
2090 | esrv_update_spells (player *pl) |
2085 | { |
2091 | { |
|
|
2092 | if (!pl->ns) |
|
|
2093 | return; |
|
|
2094 | |
2086 | if (!pl->ns->monitor_spells) |
2095 | if (!pl->ns->monitor_spells) |
2087 | return; |
2096 | return; |
2088 | |
2097 | |
2089 | for (object *spell = pl->ob->inv; spell; spell = spell->below) |
2098 | for (object *spell = pl->ob->inv; spell; spell = spell->below) |
2090 | { |
2099 | { |