… | |
… | |
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 |
… | |
… | |
399 | { |
399 | { |
400 | ns->sound = atoi (param); |
400 | ns->sound = atoi (param); |
401 | safe_strcat (cmdback, param, &slen, HUGE_BUF); |
401 | safe_strcat (cmdback, param, &slen, HUGE_BUF); |
402 | } |
402 | } |
403 | else if (!strcmp (cmd, "exp64")) |
403 | else if (!strcmp (cmd, "exp64")) |
404 | { |
|
|
405 | ns->exp64 = atoi (param); |
|
|
406 | safe_strcat (cmdback, param, &slen, HUGE_BUF); |
404 | safe_strcat (cmdback, param, &slen, HUGE_BUF); |
407 | } |
|
|
408 | else if (!strcmp (cmd, "spellmon")) |
405 | else if (!strcmp (cmd, "spellmon")) |
409 | { |
406 | { |
410 | ns->monitor_spells = atoi (param); |
407 | ns->monitor_spells = atoi (param); |
411 | safe_strcat (cmdback, param, &slen, HUGE_BUF); |
408 | safe_strcat (cmdback, param, &slen, HUGE_BUF); |
412 | } |
409 | } |
… | |
… | |
917 | { |
914 | { |
918 | ns->sound = atoi (buf); |
915 | ns->sound = atoi (buf); |
919 | } |
916 | } |
920 | |
917 | |
921 | /** client wants the map resent */ |
918 | /** client wants the map resent */ |
922 | |
|
|
923 | void |
919 | void |
924 | MapRedrawCmd (char *buf, int len, player *pl) |
920 | MapRedrawCmd (char *buf, int len, player *pl) |
925 | { |
921 | { |
926 | /* 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 |
927 | * 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. |
… | |
… | |
1013 | void |
1009 | void |
1014 | esrv_update_stats (player *pl) |
1010 | esrv_update_stats (player *pl) |
1015 | { |
1011 | { |
1016 | char buf[MAX_BUF]; |
1012 | char buf[MAX_BUF]; |
1017 | uint16 flags; |
1013 | uint16 flags; |
|
|
1014 | |
|
|
1015 | if (!pl->ns) |
|
|
1016 | return; |
1018 | |
1017 | |
1019 | packet sl ("stats"); |
1018 | packet sl ("stats"); |
1020 | |
1019 | |
1021 | if (pl->ob) |
1020 | if (pl->ob) |
1022 | { |
1021 | { |
… | |
… | |
1033 | AddIfShort (pl->last_stats.Wis, pl->ob->stats.Wis, CS_STAT_WIS); |
1032 | AddIfShort (pl->last_stats.Wis, pl->ob->stats.Wis, CS_STAT_WIS); |
1034 | AddIfShort (pl->last_stats.Pow, pl->ob->stats.Pow, CS_STAT_POW); |
1033 | AddIfShort (pl->last_stats.Pow, pl->ob->stats.Pow, CS_STAT_POW); |
1035 | AddIfShort (pl->last_stats.Cha, pl->ob->stats.Cha, CS_STAT_CHA); |
1034 | AddIfShort (pl->last_stats.Cha, pl->ob->stats.Cha, CS_STAT_CHA); |
1036 | } |
1035 | } |
1037 | |
1036 | |
1038 | if (pl->ns->exp64) |
|
|
1039 | for (int s = 0; s < NUM_SKILLS; s++) |
1037 | for (int s = 0; s < NUM_SKILLS; s++) |
1040 | if (pl->last_skill_ob[s] && pl->last_skill_exp[s] != pl->last_skill_ob[s]->stats.exp) |
1038 | if (pl->last_skill_ob[s] && pl->last_skill_exp[s] != pl->last_skill_ob[s]->stats.exp) |
1041 | { |
1039 | { |
1042 | /* Always send along the level if exp changes. This is only |
1040 | /* Always send along the level if exp changes. This is only |
1043 | * 1 extra byte, but keeps processing simpler. |
1041 | * 1 extra byte, but keeps processing simpler. |
1044 | */ |
1042 | */ |
1045 | sl << uint8 (s + CS_STAT_SKILLINFO) |
1043 | sl << uint8 (s + CS_STAT_SKILLINFO) |
1046 | << uint8 (pl->last_skill_ob[s]->level) |
1044 | << uint8 (pl->last_skill_ob[s]->level) |
1047 | << uint64 (pl->last_skill_ob[s]->stats.exp); |
1045 | << uint64 (pl->last_skill_ob[s]->stats.exp); |
1048 | |
1046 | |
1049 | pl->last_skill_exp[s] = pl->last_skill_ob[s]->stats.exp; |
1047 | pl->last_skill_exp[s] = pl->last_skill_ob[s]->stats.exp; |
1050 | } |
1048 | } |
1051 | |
1049 | |
1052 | if (pl->ns->exp64) |
|
|
1053 | { AddIfInt64 (pl->last_stats.exp, pl->ob->stats.exp, CS_STAT_EXP64) } |
1050 | AddIfInt64 (pl->last_stats.exp, pl->ob->stats.exp, CS_STAT_EXP64); |
1054 | else |
|
|
1055 | { AddIfInt (pl->last_stats.exp, (int) pl->ob->stats.exp, CS_STAT_EXP) } |
|
|
1056 | |
|
|
1057 | AddIfShort (pl->last_level, (char) pl->ob->level, CS_STAT_LEVEL); |
1051 | AddIfShort (pl->last_level, (char) pl->ob->level, CS_STAT_LEVEL); |
1058 | AddIfShort (pl->last_stats.wc, pl->ob->stats.wc, CS_STAT_WC); |
1052 | AddIfShort (pl->last_stats.wc, pl->ob->stats.wc, CS_STAT_WC); |
1059 | AddIfShort (pl->last_stats.ac, pl->ob->stats.ac, CS_STAT_AC); |
1053 | AddIfShort (pl->last_stats.ac, pl->ob->stats.ac, CS_STAT_AC); |
1060 | AddIfShort (pl->last_stats.dam, pl->ob->stats.dam, CS_STAT_DAM); |
1054 | AddIfShort (pl->last_stats.dam, pl->ob->stats.dam, CS_STAT_DAM); |
1061 | AddIfFloat (pl->last_speed, pl->ob->speed, CS_STAT_SPEED); |
1055 | AddIfFloat (pl->last_speed, pl->ob->speed, CS_STAT_SPEED); |
… | |
… | |
1511 | ob = GET_MAP_FACE_OBJ (mp, mx, my, layer); |
1505 | ob = GET_MAP_FACE_OBJ (mp, mx, my, layer); |
1512 | |
1506 | |
1513 | /* 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 |
1514 | * is the blank face, set the smoothlevel to zero. |
1508 | * is the blank face, set the smoothlevel to zero. |
1515 | */ |
1509 | */ |
1516 | if (!ob || ob->face == blank_face || MAP_NOSMOOTH (mp)) |
1510 | if (!ob || ob->face == blank_face) |
1517 | smoothlevel = 0; |
1511 | smoothlevel = 0; |
1518 | else |
1512 | else |
1519 | { |
1513 | { |
1520 | smoothlevel = ob->smoothlevel; |
1514 | smoothlevel = ob->smoothlevel; |
1521 | if (smoothlevel && !(ns.faces_sent[ob->face->number] & NS_FACESENT_SMOOTH)) |
1515 | if (smoothlevel && !(ns.faces_sent[ob->face->number] & NS_FACESENT_SMOOTH)) |
… | |
… | |
1594 | uint8 extendedinfos; |
1588 | uint8 extendedinfos; |
1595 | maptile *m; |
1589 | maptile *m; |
1596 | |
1590 | |
1597 | client &socket = *pl->contr->ns; |
1591 | client &socket = *pl->contr->ns; |
1598 | |
1592 | |
|
|
1593 | if (!pl->active ()) |
|
|
1594 | return; |
|
|
1595 | |
1599 | check_map_change (pl->contr); |
1596 | check_map_change (pl->contr); |
1600 | |
1597 | |
1601 | packet sl (socket.mapmode == Map1Cmd ? "map1" : "map1a"); |
1598 | packet sl (socket.mapmode == Map1Cmd ? "map1" : "map1a"); |
1602 | packet esl; |
1599 | packet esl; |
1603 | |
1600 | |
… | |
… | |
1723 | map_clearcell (&lastcell, 0, 0, 0, -1); |
1720 | map_clearcell (&lastcell, 0, 0, 0, -1); |
1724 | } |
1721 | } |
1725 | } |
1722 | } |
1726 | else if (d > 3) |
1723 | else if (d > 3) |
1727 | { |
1724 | { |
|
|
1725 | m->touch (); |
|
|
1726 | |
1728 | int need_send = 0, count; |
1727 | int need_send = 0, count; |
1729 | |
1728 | |
1730 | /* This block deals with spaces that are not visible for whatever |
1729 | /* This block deals with spaces that are not visible for whatever |
1731 | * reason. Still may need to send the head for this space. |
1730 | * reason. Still may need to send the head for this space. |
1732 | */ |
1731 | */ |
… | |
… | |
1765 | else |
1764 | else |
1766 | sl.reset (oldlen); |
1765 | sl.reset (oldlen); |
1767 | } |
1766 | } |
1768 | else |
1767 | else |
1769 | { |
1768 | { |
|
|
1769 | m->touch (); |
|
|
1770 | |
1770 | /* 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 |
1771 | * we need to send. |
1772 | * we need to send. |
1772 | */ |
1773 | */ |
1773 | |
1774 | |
1774 | /* Rather than try to figure out what everything that we might |
1775 | /* Rather than try to figure out what everything that we might |
… | |
… | |
2089 | * it then sends an updspell packet for each spell that has changed in this way |
2090 | * it then sends an updspell packet for each spell that has changed in this way |
2090 | */ |
2091 | */ |
2091 | void |
2092 | void |
2092 | esrv_update_spells (player *pl) |
2093 | esrv_update_spells (player *pl) |
2093 | { |
2094 | { |
|
|
2095 | if (!pl->ns) |
|
|
2096 | return; |
|
|
2097 | |
2094 | if (!pl->ns->monitor_spells) |
2098 | if (!pl->ns->monitor_spells) |
2095 | return; |
2099 | return; |
2096 | |
2100 | |
2097 | for (object *spell = pl->ob->inv; spell; spell = spell->below) |
2101 | for (object *spell = pl->ob->inv; spell; spell = spell->below) |
2098 | { |
2102 | { |