| … | |
… | |
| 399 | if (flags & UPD_FLAGS) |
399 | if (flags & UPD_FLAGS) |
| 400 | sl << uint32 (query_flags (op)); |
400 | sl << uint32 (query_flags (op)); |
| 401 | |
401 | |
| 402 | if (flags & UPD_WEIGHT) |
402 | if (flags & UPD_WEIGHT) |
| 403 | { |
403 | { |
| 404 | sint32 weight = op->flag [FLAG_NO_PICK] ? -1 : op->client_weight (); |
404 | sint32 weight = op->client_weight (); |
| 405 | |
405 | |
| 406 | if (op) |
406 | if (op == pl) |
| 407 | ns->last_weight = weight; |
407 | ns->last_weight = weight; |
| 408 | |
408 | |
| 409 | sl << uint32 (weight); |
409 | sl << uint32 (weight); |
| 410 | } |
410 | } |
| 411 | |
411 | |
| … | |
… | |
| 729 | |
729 | |
| 730 | int dy = atoi (cp); |
730 | int dy = atoi (cp); |
| 731 | |
731 | |
| 732 | if (player *opl = pl->observe->contr) |
732 | if (player *opl = pl->observe->contr) |
| 733 | if (client *ns = opl->ns) |
733 | if (client *ns = opl->ns) |
| 734 | { |
734 | if (opl->blocked_los (dx, dy) >= LOS_MAX) |
| 735 | if (fabs (dx) > ns->mapx / 2 || fabs (dy) > ns->mapy / 2) |
|
|
| 736 | return; |
735 | return; |
| 737 | |
|
|
| 738 | if (opl->blocked_los[dx + ns->mapx / 2][dy + ns->mapy / 2]) |
|
|
| 739 | return; |
|
|
| 740 | } |
|
|
| 741 | |
736 | |
| 742 | look_at (pl, dx, dy); |
737 | look_at (pl, dx, dy); |
| 743 | } |
738 | } |
| 744 | |
739 | |
| 745 | /** Move an object to a new location */ |
740 | /** Move an object to a new location */ |
