Use snxtitem_xy() instead of snxtitem_dist(..., 0)

Affected: launch_as() and takeover().

diff --git a/src/lib/commands/laun.c b/src/lib/commands/laun.c
index 3c028376f55f6b90a7f0db2f47b1f7128f86789a..efdd73f9d35d8f70c2ef7b6df373ad3d93ef4896 100644 (file)
--- a/src/lib/commands/laun.c
+++ b/src/lib/commands/laun.c
@@ -158,7 +158,7 @@ launch_as(struct plnstr *pp)
        return RET_FAIL;
     }
     goodtarget = 0;
-    snxtitem_dist(&ni, EF_PLANE, sx, sy, 0);
+    snxtitem_xy(&ni, EF_PLANE, sx, sy);
     while (!goodtarget && nxtitem(&ni, &plane)) {
        if (!plane.pln_own)
            continue;

diff --git a/src/lib/subs/takeover.c b/src/lib/subs/takeover.c
index 6ea2dc30b920e009a3e59878c40c6f3dbc5fb795..a5342ea41753af37c8cd679c256eba2a7ff42b72 100644 (file)
--- a/src/lib/subs/takeover.c
+++ b/src/lib/subs/takeover.c
@@ -73,7 +73,7 @@ takeover(struct sctstr *sp, natid newown)
 
     pp = &p;
     /* Take over planes */
-    snxtitem_dist(&ni, EF_PLANE, sp->sct_x, sp->sct_y, 0);
+    snxtitem_xy(&ni, EF_PLANE, sp->sct_x, sp->sct_y);
     while (nxtitem(&ni, pp)) {
        if (pp->pln_own != sp->sct_own)
            continue;
@@ -82,7 +82,7 @@ takeover(struct sctstr *sp, natid newown)
 
     /* Take over land units */
     lp = &land;
-    snxtitem_dist(&ni, EF_LAND, sp->sct_x, sp->sct_y, 0);
+    snxtitem_xy(&ni, EF_LAND, sp->sct_x, sp->sct_y);
     while (nxtitem(&ni, lp)) {
        if ((lp->lnd_own == newown) || (lp->lnd_own == 0))
            continue;