Make escort mission obey op-area

[empserver] / src / lib / subs / mission.c

diff --git a/src/lib/subs/mission.c b/src/lib/subs/mission.c
index dbad24fb77a1778f12ab8a76651db37d91ce7d39..c4243b4f9149645c255016b487a7ff3bed580ba0 100644 (file)
--- a/src/lib/subs/mission.c
+++ b/src/lib/subs/mission.c
@@ -355,20 +355,15 @@ find_escorts(coord x, coord y, natid cn, struct emp_qelem *escorts)
     struct nstr_item ni;
     struct plist *plp;
     struct plnstr plane;
-    int dist;
 
     snxtitem_all(&ni, EF_PLANE);
     while (nxtitem(&ni, &plane)) {
        if (plane.pln_own != cn)
            continue;
-
        if (plane.pln_mission != MI_ESCORT)
            continue;
-
-       dist = mapdist(x, y, plane.pln_x, plane.pln_y);
-       if (dist > plane.pln_range / 2)
+       if (!in_oparea((struct empobj *)&plane, x, y))
            continue;
-
        plp = malloc(sizeof(struct plist));
        memset(plp, 0, sizeof(struct plist));
        plp->pcp = &plchr[(int)plane.pln_type];
@@ -768,16 +763,13 @@ show_mission(int type, struct nstr_item *np)
        case MI_INTERDICT:
        case MI_SUPPORT:
        case MI_RESERVE:
+       case MI_ESCORT:
        case MI_AIR_DEFENSE:
        case MI_DSUPPORT:
        case MI_OSUPPORT:
            prxy(" %3d,%-3d", gp->opx, gp->opy, player->cnum);
            pr("  %4d", gp->radius);
            break;
-       case MI_ESCORT:
-           pr("        ");
-           pr("  %4d", item.plane.pln_range / 2);
-           break;
        default:
            CANT_REACH();
            /* fall through */