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

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

diff --git a/src/lib/commands/sona.c b/src/lib/commands/sona.c
index f38e8a6c13439ac273ce745eb69be104629da261..7e7e6d2f014dd7cf2abce18eb13c7885e1a355a4 100644 (file)
--- a/src/lib/commands/sona.c
+++ b/src/lib/commands/sona.c
@@ -173,7 +173,7 @@ sona(void)
            if (rad[y][x] != dchr[SCT_WATER].d_mnem && rad[y][x] != 'X')
                continue;
            if (tmcp->m_flags & M_SUB &&
-               getrel(getnatp(targ.shp_own), player->cnum) < FRIENDLY) {
+               relations_with(targ.shp_own, player->cnum) < FRIENDLY) {
                if (mcp->m_vrnge + visib < 8)
                    pr("Sonar detects sub #%d @ %s\n",
                       targ.shp_uid,
@@ -275,7 +275,7 @@ plane_sona(struct emp_qelem *plane_list, int x, int y,
                pr("Sonar contact in %s\n", xyas(x, y, player->cnum));
                found = 1;
            }
-           if (getrel(getnatp(targ->shp_own), pp->pln_own) < FRIENDLY &&
+           if (relations_with(targ->shp_own, pp->pln_own) < FRIENDLY &&
                roll(100) > pln_identchance(pp, shp_hardtarget(targ),
                                            EF_SHIP))
                if (roll(100) > pln_identchance(pp, shp_hardtarget(targ),