Use relations_with() for US==THEM || getrel(getnatp(US), THEM)

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

diff --git a/src/lib/commands/scut.c b/src/lib/commands/scut.c
index 570cb89aa6427de7d54db94c1482bd285c793efb..ce9c6146b36974cfd1cb43d1b59820ae8648e2cb 100644 (file)
--- a/src/lib/commands/scut.c
+++ b/src/lib/commands/scut.c
@@ -165,8 +165,7 @@ scuttle_tradeship(struct shpstr *sp, int interactive)
     mp = &mchr[(int)sp->shp_type];
     getsect(sp->shp_x, sp->shp_y, &sect);
     if (sect.sct_own && sect.sct_type == SCT_HARBR && sect.sct_effic >= 2
-       && (sect.sct_own == sp->shp_own
-           || getrel(getnatp(sect.sct_own), sp->shp_own) >= FRIENDLY)) {
+       && relations_with(sect.sct_own, sp->shp_own) >= FRIENDLY) {
        dist = mapdist(sp->shp_x, sp->shp_y,
                       sp->shp_orig_x, sp->shp_orig_y);
        /* Don't disclose distance to to pirates */