bridgefall: Fix loss of bridge support with EASY_BRIDGES off

[empserver] / src / lib / subs / bridgefall.c

diff --git a/src/lib/subs/bridgefall.c b/src/lib/subs/bridgefall.c
index e2b409df99c88ecc194d35bc5e771c8e49e2492c..ffc79f98d1ed78e191834601cfa8fba2ecec3142 100644 (file)
--- a/src/lib/subs/bridgefall.c
+++ b/src/lib/subs/bridgefall.c
@@ -1,6 +1,6 @@
 /*
  *  Empire - A multi-player, client/server Internet based war game.
- *  Copyright (C) 1986-2011, Dave Pare, Jeff Bailey, Thomas Ruschak,
+ *  Copyright (C) 1986-2014, Dave Pare, Jeff Bailey, Thomas Ruschak,
  *                Ken Stevens, Steve McClure, Markus Armbruster
  *
  *  Empire is free software: you can redistribute it and/or modify
@@ -28,16 +28,14 @@
  *
  *  Known contributors to this file:
  *     Steve McClure, 1998
- *     Markus Armbruster, 2004-2009
+ *     Markus Armbruster, 2004-2014
  */
 
 #include <config.h>
 
 #include "file.h"
 #include "land.h"
-#include "lost.h"
 #include "misc.h"
-#include "nat.h"
 #include "nsc.h"
 #include "nuke.h"
 #include "optlist.h"
@@ -68,7 +66,7 @@ bridge_damaged(struct sctstr *sp)
     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);
 }
 
@@ -84,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];
@@ -94,11 +89,20 @@ bridgefall(struct sctstr *sp)
        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;