Update copyright notice

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

diff --git a/src/lib/subs/bridgefall.c b/src/lib/subs/bridgefall.c
index fe408880afb931661936b2f40246a4b168fabf2f..837e9147a7d7b33b1e2b3f039710a37e4233d3fc 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-2009, Dave Pare, Jeff Bailey, Thomas Ruschak,
- *                           Ken Stevens, Steve McClure
+ *  Copyright (C) 1986-2012, 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/>.
  *
  *  ---
  *
@@ -29,16 +28,14 @@
  *
  *  Known contributors to this file:
  *     Steve McClure, 1998
- *     Markus Armbruster, 2004-2008
+ *     Markus Armbruster, 2004-2010
  */
 
 #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"
@@ -85,6 +82,9 @@ 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,13 +102,6 @@ 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(&sect);
@@ -126,7 +119,6 @@ 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",
@@ -148,9 +140,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;
@@ -165,9 +154,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;
@@ -180,9 +166,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;