empire/empserver
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Revert "Remove dead EASY_BRIDGES code from bridgefall()"

Browse source 
This reverts commit df62b8604d.

The next commit will revive that code.

Signed-off-by: Markus Armbruster <armbru@pond.sub.org>
This commit is contained in:
Markus Armbruster 2014-01-17 20:31:32 +01:00
parent f5244d4702
commit d80ecb97f5
1 changed files with 7 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

10
src/lib/subs/bridgefall.c
View file

@ -82,9 +82,6 @@ bridgefall(struct sctstr *sp)
int nnx; int nnx;
int nny; int nny;
if (CANT_HAPPEN(opt_EASY_BRIDGES))
return;
for (i = 1; i <= 6; i++) { for (i = 1; i <= 6; i++) {
nx = sp->sct_x + diroff[i][0]; nx = sp->sct_x + diroff[i][0];
ny = sp->sct_y + diroff[i][1]; ny = sp->sct_y + diroff[i][1];
@ -102,6 +99,13 @@ bridgefall(struct sctstr *sp)
break; break;
if (bh_sect.sct_type == SCT_BTOWER) if (bh_sect.sct_type == SCT_BTOWER)
break; 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) { if (j > 6) {
knockdown(&sect); knockdown(&sect);