Use relations_with() for getrel(getnatp(US), THEM) where US!=THEM

[empserver] / src / lib / commands / tend.c

diff --git a/src/lib/commands/tend.c b/src/lib/commands/tend.c
index 13856384d1503638584b39563a9ebca449e16fa3..1bd33e7b5e1cdee4c6ddfdc5441cab056500618a 100644 (file)
--- a/src/lib/commands/tend.c
+++ b/src/lib/commands/tend.c
@@ -134,8 +134,8 @@ tend(void)
            return RET_SYN;
        total = 0;
        while (nxtitem(&targets, &target)) {
-           if (!player->owner &&
-               (getrel(getnatp(target.shp_own), player->cnum) < FRIENDLY))
+           if (!player->owner
+               && relations_with(target.shp_own, player->cnum) < FRIENDLY)
                continue;
            if (target.shp_uid == tender.shp_uid)
                continue;
@@ -232,8 +232,8 @@ tend_land(struct shpstr *tenderp, char *units)
        if (!check_ship_ok(tenderp) || !check_land_ok(&land))
            return RET_SYN;
        while (nxtitem(&targets, &target)) {
-           if (!player->owner &&
-               (getrel(getnatp(target.shp_own), player->cnum) < FRIENDLY))
+           if (!player->owner
+               && relations_with(target.shp_own, player->cnum) < FRIENDLY)
                continue;
            if (target.shp_uid == tenderp->shp_uid)
                continue;