From: Markus Armbruster <armbru@pond.sub.org>
Date: Sun, 29 Mar 2009 17:18:10 +0000 (+0200)
Subject: Remove dead EASY_BRIDGES code from bridgefall()
X-Git-Tag: v4.3.22~35
X-Git-Url: http://git.pond.sub.org/?p=empserver;a=commitdiff_plain;h=df62b8604d7607947131a9d4c04a92d08954ca34

Remove dead EASY_BRIDGES code from bridgefall()

Dead since commit 40eb78eb, v4.3.12.
---

diff --git a/src/lib/subs/bridgefall.c b/src/lib/subs/bridgefall.c
index fe408880a..b2a026e76 100644
--- a/src/lib/subs/bridgefall.c
+++ b/src/lib/subs/bridgefall.c
@@ -85,6 +85,9 @@ bridgefall(struct sctstr *sp)
     int nnx;
     int nny;
 
+    if (CANT_HAPPEN(opt_EASY_BRIDGES))
+	return;
+
     for (i = 1; i <= 6; i++) {
 	nx = sp->sct_x + diroff[i][0];
 	ny = sp->sct_y + diroff[i][1];
@@ -102,13 +105,6 @@ bridgefall(struct sctstr *sp)
 		break;
 	    if (bh_sect.sct_type == SCT_BTOWER)
 		break;
-	    /* With EASY_BRIDGES, it just has to be next to any
-	       land */
-	    if (opt_EASY_BRIDGES) {
-		if (bh_sect.sct_type != SCT_WATER &&
-		    bh_sect.sct_type != SCT_BSPAN)
-		    break;
-	    }
 	}
 	if (j > 6) {
 	    knockdown(&sect);