bridgefall: Clean up literal 20 to SCT_MINEFF

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

diff --git a/src/lib/subs/bridgefall.c b/src/lib/subs/bridgefall.c
index 4818eb57f4d16d7db1447db8351ef05371d16a20..426bba7085a7c46af296b6ed4a299829113eb026 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-2015, Dave Pare, Jeff Bailey, Thomas Ruschak,
  *                Ken Stevens, Steve McClure, Markus Armbruster
  *
  *  Empire is free software: you can redistribute it and/or modify
@@ -28,7 +28,7 @@
  *
  *  Known contributors to this file:
  *     Steve McClure, 1998
- *     Markus Armbruster, 2004-2010
+ *     Markus Armbruster, 2004-2014
  */
 
 #include <config.h>
@@ -48,6 +48,35 @@
 
 static void knockdown(struct sctstr *);
 
+/*
+ * Is there support for a bridge at SP?
+ * Ignore support coming from direction IGNORE_DIR.
+ */
+int
+bridge_support_at(struct sctstr *sp, int ignore_dir)
+{
+    int i, nx, ny;
+    struct sctstr sect;
+
+    for (i = 1; i <= 6; i++) {
+       if (i == ignore_dir)
+           continue;
+       nx = sp->sct_x + diroff[i][0];
+       ny = sp->sct_y + diroff[i][1];
+       getsect(nx, ny, &sect);
+       if (opt_EASY_BRIDGES
+           && sect.sct_type != SCT_WATER && sect.sct_type != SCT_BSPAN)
+           return 1;
+       if (sect.sct_effic < SCT_MINEFF)
+           continue;
+       if (sect.sct_type == SCT_BHEAD && sect.sct_newtype == SCT_BHEAD)
+           return 1;
+       if (sect.sct_type == SCT_BTOWER)
+           return 1;
+    }
+    return 0;
+}
+
 /*
  * Check bridges at and around SP after damage to SP.
  * If SP is an inefficent bridge, splash it.
@@ -66,7 +95,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);
 }
 
@@ -74,36 +103,16 @@ void
 bridgefall(struct sctstr *sp)
 {
     int i;
-    int j;
     struct sctstr sect;
-    struct sctstr bh_sect;
     int nx;
     int ny;
-    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];
        getsect(nx, ny, &sect);
-       if (sect.sct_type != SCT_BSPAN)
-           continue;
-       for (j = 1; j <= 6; j++) {
-           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;
-       }
-       if (j > 6) {
+       if (sect.sct_type == SCT_BSPAN
+           && !bridge_support_at(&sect, DIR_BACK(i))) {
            knockdown(&sect);
            putsect(&sect);
        }