| … | |
… | |
| 1608 | { |
1608 | { |
| 1609 | best_distance = tmpi; |
1609 | best_distance = tmpi; |
| 1610 | best = tmp; |
1610 | best = tmp; |
| 1611 | } |
1611 | } |
| 1612 | } |
1612 | } |
|
|
1613 | |
| 1613 | if (best != op1) |
1614 | if (best != op1) |
| 1614 | { |
1615 | { |
| 1615 | retval->distance_x += op1->x - best->x; |
1616 | retval->distance_x += op1->x - best->x; |
| 1616 | retval->distance_y += op1->y - best->y; |
1617 | retval->distance_y += op1->y - best->y; |
| 1617 | } |
1618 | } |
| 1618 | } |
1619 | } |
|
|
1620 | |
| 1619 | retval->part = best; |
1621 | retval->part = best; |
| 1620 | retval->distance = isqrt (retval->distance_x * retval->distance_x + retval->distance_y * retval->distance_y); |
1622 | retval->distance = idistance (retval->distance_x, retval->distance_y); |
| 1621 | retval->direction = find_dir_2 (-retval->distance_x, -retval->distance_y); |
1623 | retval->direction = find_dir_2 (-retval->distance_x, -retval->distance_y); |
| 1622 | } |
1624 | } |
| 1623 | } |
1625 | } |
| 1624 | |
1626 | |
| 1625 | /* this is basically the same as get_rangevector above, but instead of |
1627 | /* this is basically the same as get_rangevector above, but instead of |
| … | |
… | |
| 1649 | { |
1651 | { |
| 1650 | retval->distance_x += op2->x - x; |
1652 | retval->distance_x += op2->x - x; |
| 1651 | retval->distance_y += op2->y - y; |
1653 | retval->distance_y += op2->y - y; |
| 1652 | |
1654 | |
| 1653 | retval->part = NULL; |
1655 | retval->part = NULL; |
| 1654 | retval->distance = isqrt (retval->distance_x * retval->distance_x + retval->distance_y * retval->distance_y); |
1656 | retval->distance = idistance (retval->distance_x, retval->distance_y); |
| 1655 | retval->direction = find_dir_2 (-retval->distance_x, -retval->distance_y); |
1657 | retval->direction = find_dir_2 (-retval->distance_x, -retval->distance_y); |
| 1656 | } |
1658 | } |
| 1657 | } |
1659 | } |
| 1658 | |
1660 | |
| 1659 | /* Returns true of op1 and op2 are effectively on the same map |
1661 | /* Returns true of op1 and op2 are effectively on the same map |
