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 0a436af7a92978b085c44bfa6cb6f34eff3c94e7..ffc79f98d1ed78e191834601cfa8fba2ecec3142 100644 (file)
--- a/src/lib/subs/bridgefall.c
+++ b/src/lib/subs/bridgefall.c
@@ -1,11 +1,11 @@
 /*
  *  Empire - A multi-player, client/server Internet based war game.
- *  Copyright (C) 1986-2008, Dave Pare, Jeff Bailey, Thomas Ruschak,
- *                           Ken Stevens, Steve McClure
+ *  Copyright (C) 1986-2014, Dave Pare, Jeff Bailey, Thomas Ruschak,
+ *                Ken Stevens, Steve McClure, Markus Armbruster
  *
- *  This program is free software; you can redistribute it and/or modify
+ *  Empire is free software: you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation; either version 2 of the License, or
+ *  the Free Software Foundation, either version 3 of the License, or
  *  (at your option) any later version.
  *
  *  This program is distributed in the hope that it will be useful,
@@ -14,8 +14,7 @@
  *  GNU General Public License for more details.
  *
  *  You should have received a copy of the GNU General Public License
- *  along with this program; if not, write to the Free Software
- *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
  *
  *  ---
  *
@@ -26,19 +25,17 @@
  *  ---
  *
  *  bridgefall.c: Knock a bridge down
- * 
+ *
  *  Known contributors to this file:
  *     Steve McClure, 1998
- *     Markus Armbruster, 2004-2008
+ *     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"
@@ -69,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);
 }
 
@@ -92,16 +89,11 @@ 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);
-           if (bh_sect.sct_type == SCT_BHEAD &&
-               bh_sect.sct_newtype == SCT_BHEAD)
-               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) {
@@ -109,6 +101,13 @@ bridgefall(struct sctstr *sp)
                    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;
+           if (bh_sect.sct_type == SCT_BTOWER)
+               break;
        }
        if (j > 6) {
            knockdown(&sect);
@@ -126,15 +125,15 @@ knockdown(struct sctstr *sp)
     struct plnstr plane;
     struct nukstr nuke;
     struct nstr_item ni;
-    struct natstr *np;
 
     mpr(sp->sct_own,
        "Crumble... SCREEEECH!  Splash! Bridge%s falls at %s!\n",
        sp->sct_type == SCT_BTOWER ? " tower" : "",
        xyas(sp->sct_x, sp->sct_y, sp->sct_own));
+    if (!SCT_MINES_ARE_SEAMINES(sp))
+       sp->sct_mines = 0;
     sp->sct_type = SCT_WATER;
     sp->sct_newtype = SCT_WATER;
-    makelost(EF_SECTOR, sp->sct_own, 0, sp->sct_x, sp->sct_y);
     sp->sct_own = 0;
     sp->sct_oldown = 0;
     sp->sct_mobil = 0;
@@ -147,9 +146,6 @@ knockdown(struct sctstr *sp)
            continue;
        if (land.lnd_ship >= 0)
            continue;
-       np = getnatp(land.lnd_own);
-       if (np->nat_flags & NF_BEEP)
-           mpr(land.lnd_own, "\07");
        mpr(land.lnd_own, "     AARGH! %s tumbles to its doom!\n",
            prland(&land));
        land.lnd_effic = 0;
@@ -164,9 +160,6 @@ knockdown(struct sctstr *sp)
            continue;
        if (plane.pln_ship >= 0)
            continue;
-       np = getnatp(plane.pln_own);
-       if (np->nat_flags & NF_BEEP)
-           mpr(plane.pln_own, "\07");
        mpr(plane.pln_own, "     AARGH! %s tumbles to its doom!\n",
            prplane(&plane));
        plane.pln_effic = 0;
@@ -179,9 +172,6 @@ knockdown(struct sctstr *sp)
            continue;
        if (nuke.nuk_plane >= 0)
            continue;
-       np = getnatp(nuke.nuk_own);
-       if (np->nat_flags & NF_BEEP)
-           mpr(nuke.nuk_own, "\07");
        mpr(nuke.nuk_own, "     %s sinks to the bottom of the sea!\n",
            prnuke(&nuke));
        nuke.nuk_effic = 0;