*
* Known contributors to this file:
* Steve McClure, 1998
- * Markus Armbruster, 2004-2010
+ * Markus Armbruster, 2004-2014
*/
#include <config.h>
des = sp->sct_type;
if (des == SCT_BSPAN || des == SCT_BTOWER)
knockdown(sp);
- if ((des == SCT_BHEAD || des == SCT_BTOWER) && !opt_EASY_BRIDGES)
+ if ((des == SCT_BHEAD && !opt_EASY_BRIDGES) || des == SCT_BTOWER)
bridgefall(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];
if (sect.sct_type != SCT_BSPAN)
continue;
for (j = 1; j <= 6; j++) {
+ if (j == DIR_BACK(i))
+ continue;
nnx = nx + diroff[j][0];
nny = ny + diroff[j][1];
- if (nnx == sp->sct_x && nny == sp->sct_y)
- continue;
getsect(nnx, nny, &bh_sect);
+ /* 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 (bh_sect.sct_effic < 20)
+ continue;
if (bh_sect.sct_type == SCT_BHEAD &&
bh_sect.sct_newtype == SCT_BHEAD)
break;