From d80ecb97f50692df695ff239cd43d89e282dd1e4 Mon Sep 17 00:00:00 2001 From: Markus Armbruster Date: Fri, 17 Jan 2014 20:31:32 +0100 Subject: [PATCH] Revert "Remove dead EASY_BRIDGES code from bridgefall()" This reverts commit df62b8604d7607947131a9d4c04a92d08954ca34. The next commit will revive that code. Signed-off-by: Markus Armbruster --- src/lib/subs/bridgefall.c | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/src/lib/subs/bridgefall.c b/src/lib/subs/bridgefall.c index 52fab404..2a283304 100644 --- a/src/lib/subs/bridgefall.c +++ b/src/lib/subs/bridgefall.c @@ -82,9 +82,6 @@ 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,6 +99,13 @@ 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(§);