Use relations_with() in owned_and_navigable()

[empserver] / src / lib / common / bestpath.c

diff --git a/src/lib/common/bestpath.c b/src/lib/common/bestpath.c
index bb42ad61eec58804d07e10b6acc28ef8ed4d1d3c..efc0d6f3b97c2560ea9ce4f0c269fda7dd6bfa00 100644 (file)
--- a/src/lib/common/bestpath.c
+++ b/src/lib/common/bestpath.c
@@ -201,8 +201,7 @@ owned_and_navigable(char *bigmap, int x, int y, int own)
 
     /* Owned or allied sector?  Check the real sector.  */
     getsect(x, y, &sect);
-    if (sect.sct_own == own
-       || (sect.sct_own && getrel(getnatp(sect.sct_own), own) == ALLIED)) {
+    if (sect.sct_own && relations_with(sect.sct_own, own) == ALLIED) {
        /* FIXME duplicates shp_check_nav() logic */
        switch (dchr[sect.sct_type].d_nav) {
        case NAVOK: