From: Markus Armbruster <armbru@pond.sub.org>
Date: Wed, 29 Mar 2006 16:06:30 +0000 (+0000)
Subject: (owned_and_navigable): Do not check the real sector, only the bmap.
X-Git-Tag: v4.3.1~20
X-Git-Url: http://git.pond.sub.org/?p=empserver;a=commitdiff_plain;h=7f37ecb680e7c0eb7f0e452889058c46a7572afd

(owned_and_navigable): Do not check the real sector, only the bmap.
Checking the real sector leaks information, which can be abused to
test whether an arbitrary sector is unfriendly or an inefficient
harbor or bridge, at the cost of some ship mobility (I think).
Initially broken ca. 1993, went through several changes, but the leak
survived them all.
---

diff --git a/src/lib/common/bestpath.c b/src/lib/common/bestpath.c
index fa374b18f..67dc9999c 100644
--- a/src/lib/common/bestpath.c
+++ b/src/lib/common/bestpath.c
@@ -237,12 +237,9 @@ bestownedpath(s_char *bpath,
 static int
 owned_and_navigable(s_char *map, int x, int y, s_char *terrain, int own)
 {
-    s_char c;
     s_char *t;
     s_char mapspot;		/* What this spot on the bmap is */
     int negate;
-    struct sctstr *sect;
-    int rel;
 
     /* No terrain to check?  Everything is navigable! (this
        probably means we are flying) */
@@ -287,28 +284,6 @@ owned_and_navigable(s_char *map, int x, int y, s_char *terrain, int own)
 	return 0;
     }
 
-    /* According to our bmap, this sector is ok so far. */
-
-    /* Ok, we made it this far.  Now get the sector */
-    sect = getsectp(x, y);
-    c = dchr[sect->sct_type].d_mnem;
-    /* Ok, now, check the owner if needed */
-    if (own >= 0) {
-	if (sect->sct_own != own) {
-	    rel = getrel(getnatp(sect->sct_own), own);
-	    /* We can't sail through deity sectors, but we can sail
-	       through any ocean */
-	    if (rel < FRIENDLY && sect->sct_type != SCT_WATER)
-		return 0;
-	}
-    }
-    /* Ok, now, check these two sector types */
-    /* check for bad harbors. */
-    if (c == 'h' && sect->sct_effic < 2)
-	return 0;
-    /* check for bad bridges  */
-    if (c == '=' && sect->sct_effic < 60)
-	return 0;
-    /* Woo-hoo, it's ok! */
+    /* According to our bmap, this sector is ok. */
     return 1;
 }