Merge pull request #6026 from SJuliez/prevent-0-cf-bridges

#5984 - Prevent 0 CF bridges in generated maps

megamek/src/megamek/common/util/CityBuilder.java

@@ -51,7 +51,7 @@ public CityBuilder(MapSettings mapSettings, Board board) {
     /**
      * This function will generate a city with a grid lay out. 4 rounds running
      * North and South and 4 roads running east west
-     * 
+     *
      * @author Torren (Jason Tighe)
      * @return
      */
@@ -383,7 +383,7 @@ private void connectHexes(Coords src, Coords dest, int roadStyle) {
 
     /**
      * Build a bridge across an obstacle
-     * 
+     *
      * @todo: use a bridge not a road when bridges are working
      * @param start
      * @param direction
@@ -436,6 +436,11 @@ private void connectHexes(Coords src, Coords dest, int roadStyle) {
                     + Compute.randomInt(1 + mapSettings.getCityMaxCF()
                             - mapSettings.getCityMinCF());
 
+            if (cf == 0) {
+                // some city settings can lead to 0 CF bridges; use a default CF in this case
+                cf = 40;
+            }
+
             for (Enumeration<Coords> e = hexes.elements(); e.hasMoreElements();) {
                 Coords c = e.nextElement();
                 addBridge(board.getHex(c), exits, elev1, cf);
@@ -484,7 +489,7 @@ private void buildStraightRoad(Coords start, int direction, int roadStyle) {
 
     /**
      * Utility function for setting building type from CF table
-     * 
+     *
      * @param cf
      * @return building type
      */