add a modules.icebergs configuration variable.

conf/e2/config.json

@@ -13,7 +13,10 @@
         "game.id" : 2,
         "orders.default": "work",
         "NewbieImmunity": 8,
+        "modules.markets": false,
+        "modules.astralspace": true,
         "modules.wormholes": true,
+        "modules.icebergs": true,
         "entertain.base": 0,
         "entertain.perlevel": 20,
         "taxing.perlevel": 20,

src/kernel/terrainid.h

@@ -14,7 +14,7 @@
 extern "C" {
 #endif
 
-  enum {
+  typedef enum {
     T_OCEAN = 0,
     T_PLAIN,
     T_SWAMP,
@@ -29,8 +29,8 @@ extern "C" {
     T_VOLCANO_SMOKING,
     T_ICEBERG_SLEEP,
     T_ICEBERG,
-    NOTERRAIN = (terrain_t) - 1
-  };
+    NOTERRAIN = - 1
+  } terrain_t;
 
   extern const struct terrain_type *newterrain(terrain_t t);
   extern terrain_t oldterrain(const struct terrain_type *terrain);

src/kernel/types.h

@@ -22,7 +22,6 @@ OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 #include <settings.h>
 #include <util/variant.h>
 
-typedef short terrain_t;
 typedef short item_t;
 
 struct attrib;

src/randenc.c

@@ -610,9 +610,14 @@ static void move_icebergs(void)
 void create_icebergs(void)
 {
     region *r;
+    const struct terrain_type *t_iceberg, *t_sleep;
+
+    t_iceberg = get_terrain("iceberg");
+    t_sleep = get_terrain("iceberg_sleep");
+    assert(t_iceberg && t_sleep);
 
     for (r = regions; r; r = r->next) {
-        if (r->terrain == newterrain(T_ICEBERG_SLEEP) && chance(0.05)) {
+        if (r->terrain == t_sleep && chance(0.05)) {
             bool has_ocean_neighbour = false;
             direction_t dir;
             region *rc;
@@ -629,7 +634,7 @@ void create_icebergs(void)
             if (!has_ocean_neighbour)
                 continue;
 
-            rsetterrain(r, T_ICEBERG);
+            r->terrain = t_iceberg;
 
             fset(r, RF_SELECT);
             move_iceberg(r);
@@ -801,7 +806,9 @@ void randomevents(void)
     region *r;
     faction *monsters = get_monsters();
 
+    if (config_get_int("modules.icebergs", 0)) {
         icebergs();
+    }
     godcurse();
     orc_growth();
     demon_skillchanges();