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