Purge some references to Forest.

In particular, ctrl-O should no longer mention the branch.

15 files changed, 34 insertions, 40 deletions

diff --git a/crawl-ref/source/branch-data.h b/crawl-ref/source/branch-data.h
index 8e333a5d4a..4b21aaddf5 100644
--- a/crawl-ref/source/branch-data.h
+++ b/crawl-ref/source/branch-data.h
@@ -181,7 +181,7 @@ const Branch branches[NUM_BRANCHES] =
       NULL,
       true, BLACK, BLACK, // set per-map
       'Z', true, 0 },
-
+#if TAG_MAJOR_VERSION == 34
     { BRANCH_FOREST, BRANCH_VAULTS, 2, 3, 5, 19,
       0, 0,
       DNGN_ENTER_FOREST, DNGN_RETURN_FROM_FOREST,
@@ -189,6 +189,7 @@ const Branch branches[NUM_BRANCHES] =
       NULL,
       true, BROWN, BROWN,
       'F', true, 0 },
+#endif
 
     { BRANCH_ABYSS, NUM_BRANCHES, -1, -1, 5, 24,
       BFLAG_NO_XLEV_TRAVEL, LFLAG_NO_TELE_CONTROL | LFLAG_NO_MAP,
diff --git a/crawl-ref/source/branch.cc b/crawl-ref/source/branch.cc
index 86866fc815..ff9b56658d 100644
--- a/crawl-ref/source/branch.cc
+++ b/crawl-ref/source/branch.cc
@@ -40,8 +40,7 @@ bool is_random_subbranch(branch_type branch)
 {
     return (parent_branch(branch) == BRANCH_LAIR
             && branch != BRANCH_SLIME)
-           || branch == BRANCH_CRYPT
-           || branch == BRANCH_FOREST;
+           || branch == BRANCH_CRYPT;
 }
 
 bool is_connected_branch(branch_type branch)
@@ -77,7 +76,8 @@ branch_type get_branch_at(const coord_def& pos)
 bool branch_is_unfinished(branch_type branch)
 {
 #if TAG_MAJOR_VERSION == 34
-    if (branch == BRANCH_DWARF)
+    if (branch == BRANCH_DWARF
+        || branch == BRANCH_FOREST)
         return true;
 #endif
     return false;
diff --git a/crawl-ref/source/dbg-maps.cc b/crawl-ref/source/dbg-maps.cc
index a335a3732c..d328d50aa0 100644
--- a/crawl-ref/source/dbg-maps.cc
+++ b/crawl-ref/source/dbg-maps.cc
@@ -175,12 +175,14 @@ static bool mg_build_dungeon()
         you.where_are_you = lid.branch;
         you.depth = lid.depth;
 
+#if TAG_MAJOR_VERSION == 34
         // An unholy hack, FIXME!
         if (!brentry[BRANCH_FOREST].is_valid()
             && lid.branch == BRANCH_FOREST && lid.depth == 5)
         {
             you.unique_creatures.set(MONS_THE_ENCHANTRESS, false);
         }
+#endif
 
         if (!mg_do_build_level(1))
             return false;
diff --git a/crawl-ref/source/directn.cc b/crawl-ref/source/directn.cc
index 9906da52cc..fc32646f0f 100644
--- a/crawl-ref/source/directn.cc
+++ b/crawl-ref/source/directn.cc
@@ -3133,8 +3133,10 @@ static string _base_feature_desc(dungeon_feature_type grid, trap_type trap)
         return "staircase to the Shoals";
     case DNGN_ENTER_SPIDER:
         return "hole to the Spider Nest";
+#if TAG_MAJOR_VERSION == 34
     case DNGN_ENTER_FOREST:
         return "staircase to the Enchanted Forest";
+#endif
     case DNGN_ENTER_DEPTHS:
         return "staircase to the Depths";
     case DNGN_ENTER_ZIGGURAT:
diff --git a/crawl-ref/source/dungeon.cc b/crawl-ref/source/dungeon.cc
index 12b7dfca66..df75c37ae2 100644
--- a/crawl-ref/source/dungeon.cc
+++ b/crawl-ref/source/dungeon.cc
@@ -781,6 +781,7 @@ static bool _is_upwards_exit_stair(const coord_def &c)
     case DNGN_EXIT_HELL:
 #if TAG_MAJOR_VERSION == 34
     case DNGN_RETURN_FROM_DWARF:
+    case DNGN_RETURN_FROM_FOREST:
 #endif
     case DNGN_RETURN_FROM_ORC:
     case DNGN_RETURN_FROM_LAIR:
@@ -796,7 +797,6 @@ static bool _is_upwards_exit_stair(const coord_def &c)
     case DNGN_RETURN_FROM_SWAMP:
     case DNGN_RETURN_FROM_SHOALS:
     case DNGN_RETURN_FROM_SPIDER:
-    case DNGN_RETURN_FROM_FOREST:
     case DNGN_EXIT_PANDEMONIUM:
     case DNGN_TRANSIT_PANDEMONIUM:
     case DNGN_EXIT_ABYSS:
@@ -827,6 +827,7 @@ static bool _is_exit_stair(const coord_def &c)
     case DNGN_EXIT_HELL:
 #if TAG_MAJOR_VERSION == 34
     case DNGN_RETURN_FROM_DWARF:
+    case DNGN_RETURN_FROM_FOREST:
 #endif
     case DNGN_RETURN_FROM_ORC:
     case DNGN_RETURN_FROM_LAIR:
@@ -842,7 +843,6 @@ static bool _is_exit_stair(const coord_def &c)
     case DNGN_RETURN_FROM_SWAMP:
     case DNGN_RETURN_FROM_SHOALS:
     case DNGN_RETURN_FROM_SPIDER:
-    case DNGN_RETURN_FROM_FOREST:
     case DNGN_EXIT_PANDEMONIUM:
     case DNGN_TRANSIT_PANDEMONIUM:
     case DNGN_EXIT_ABYSS:
@@ -2373,9 +2373,6 @@ static void _post_vault_build()
             depth -= 3;
         } while (depth > 0);
     }
-
-    if (player_in_branch(BRANCH_FOREST))
-        _add_plant_clumps(2);
 }
 
 static void _build_dungeon_level(dungeon_feature_type dest_stairs_type)
@@ -4224,8 +4221,10 @@ static const vault_placement *_build_vault_impl(const map_def *vault,
     if (!make_no_exits)
     {
         const bool spotty = player_in_branch(BRANCH_ORC)
-                            || player_in_branch(BRANCH_SLIME)
-                            || player_in_branch(BRANCH_FOREST);
+#if TAG_MAJOR_VERSION == 34
+                            || player_in_branch(BRANCH_FOREST)
+#endif
+                            || player_in_branch(BRANCH_SLIME);
         place.connect(spotty);
     }
 
@@ -5706,10 +5705,12 @@ static bool _spotty_seed_ok(const coord_def& p)
 static bool _feat_is_wall_floor_liquid(dungeon_feature_type feat)
 {
     return feat_is_water(feat)
+#if TAG_MAJOR_VERSION == 34
+           || player_in_branch(BRANCH_FOREST) && feat == DNGN_TREE
+#endif
            || feat_is_lava(feat)
            || feat_is_wall(feat)
-           || feat == DNGN_FLOOR
-           || player_in_branch(BRANCH_FOREST) && feat == DNGN_TREE;
+           || feat == DNGN_FLOOR;
 }
 
 // Connect vault exit "from" to dungeon floor by growing a spotty chamber.
diff --git a/crawl-ref/source/enum.h b/crawl-ref/source/enum.h
index e815f003c2..279e99e87f 100644
--- a/crawl-ref/source/enum.h
+++ b/crawl-ref/source/enum.h
@@ -539,7 +539,9 @@ enum branch_type                // you.where_are_you
       BRANCH_FIRST_HELL = BRANCH_DIS,
       BRANCH_LAST_HELL = BRANCH_TARTARUS,
     BRANCH_ZOT,
+#if TAG_MAJOR_VERSION == 34
     BRANCH_FOREST,
+#endif
     BRANCH_ABYSS,
     BRANCH_PANDEMONIUM,
     BRANCH_ZIGGURAT,
@@ -1392,7 +1394,9 @@ enum dungeon_feature_type
     DNGN_ENTER_SWAMP,
     DNGN_ENTER_SHOALS,
     DNGN_ENTER_SPIDER,
+#if TAG_MAJOR_VERSION == 34
     DNGN_ENTER_FOREST,
+#endif
     DNGN_ENTER_DEPTHS,
         DNGN_ENTER_LAST_BRANCH = DNGN_ENTER_DEPTHS,
 
@@ -1416,7 +1420,9 @@ enum dungeon_feature_type
     DNGN_RETURN_FROM_SWAMP,
     DNGN_RETURN_FROM_SHOALS,
     DNGN_RETURN_FROM_SPIDER,
+#if TAG_MAJOR_VERSION == 34
     DNGN_RETURN_FROM_FOREST,
+#endif
     DNGN_RETURN_FROM_DEPTHS,
         DNGN_RETURN_FROM_LAST_BRANCH = DNGN_RETURN_FROM_DEPTHS,
 
diff --git a/crawl-ref/source/maps.cc b/crawl-ref/source/maps.cc
index 79bf0810d3..02735fc545 100644
--- a/crawl-ref/source/maps.cc
+++ b/crawl-ref/source/maps.cc
@@ -379,9 +379,6 @@ static bool _may_overwrite_feature(const coord_def p,
     if (grid == DNGN_DEEP_WATER)
         return water_ok;
 
-    if (grid == DNGN_TREE && player_in_branch(BRANCH_FOREST))
-        return true;
-
     // Handle all other non-LOS blocking grids here.
     if (!feat_is_opaque(grid)
         && grid != DNGN_FLOOR
diff --git a/crawl-ref/source/mon-act.cc b/crawl-ref/source/mon-act.cc
index 3f99d37233..2f1ad0f9d3 100644
--- a/crawl-ref/source/mon-act.cc
+++ b/crawl-ref/source/mon-act.cc
@@ -392,10 +392,6 @@ static bool _mon_on_interesting_grid(monster* mon)
     case DNGN_ENTER_SPIDER:
         return mons_is_native_in_branch(mon, BRANCH_SPIDER);
 
-    // And the forest natives.
-    case DNGN_ENTER_FOREST:
-        return mons_is_native_in_branch(mon, BRANCH_FOREST);
-
     default:
         return false;
     }
diff --git a/crawl-ref/source/mon-util.cc b/crawl-ref/source/mon-util.cc
index 6c89f7e8ac..74ef0a1cdb 100644
--- a/crawl-ref/source/mon-util.cc
+++ b/crawl-ref/source/mon-util.cc
@@ -859,13 +859,6 @@ bool mons_is_native_in_branch(const monster* mons,
     case BRANCH_SPIDER:
         return mons_genus(mons->type) == MONS_SPIDER;
 
-    case BRANCH_FOREST:
-        return mons_genus(mons->type) == MONS_SPRIGGAN
-               || mons_genus(mons->type) == MONS_TENGU
-               || mons_genus(mons->type) == MONS_FAUN
-               || mons_genus(mons->type) == MONS_SATYR
-               || mons_genus(mons->type) == MONS_DRYAD;
-
     case BRANCH_BLADE:
         return mons->type == MONS_DANCING_WEAPON;
 
diff --git a/crawl-ref/source/ng-init.cc b/crawl-ref/source/ng-init.cc
index 9be49698f8..8674a8a279 100644
--- a/crawl-ref/source/ng-init.cc
+++ b/crawl-ref/source/ng-init.cc
@@ -98,7 +98,6 @@ void initialise_branch_depths()
         dprf("Disabling branch: %s", branches[disabled_branch[i]].shortname);
         brentry[disabled_branch[i]].clear();
     }
-    brentry[BRANCH_FOREST].clear();
 
     for (int i = 0; i < NUM_BRANCHES; i++)
         brdepth[i] = branches[i].numlevels;
diff --git a/crawl-ref/source/terrain.cc b/crawl-ref/source/terrain.cc
index 45685741db..035450b7dd 100644
--- a/crawl-ref/source/terrain.cc
+++ b/crawl-ref/source/terrain.cc
@@ -156,6 +156,9 @@ bool feat_is_travelable_stair(dungeon_feature_type feat)
     case DNGN_ENTER_TARTARUS:
 #if TAG_MAJOR_VERSION == 34
     case DNGN_ENTER_DWARF:
+    case DNGN_RETURN_FROM_DWARF:
+    case DNGN_ENTER_FOREST:
+    case DNGN_RETURN_FROM_FOREST:
 #endif
     case DNGN_ENTER_ORC:
     case DNGN_ENTER_LAIR:
@@ -171,11 +174,7 @@ bool feat_is_travelable_stair(dungeon_feature_type feat)
     case DNGN_ENTER_SWAMP:
     case DNGN_ENTER_SHOALS:
     case DNGN_ENTER_SPIDER:
-    case DNGN_ENTER_FOREST:
     case DNGN_ENTER_DEPTHS:
-#if TAG_MAJOR_VERSION == 34
-    case DNGN_RETURN_FROM_DWARF:
-#endif
     case DNGN_RETURN_FROM_ORC:
     case DNGN_RETURN_FROM_LAIR:
     case DNGN_RETURN_FROM_SLIME:
@@ -190,7 +189,6 @@ bool feat_is_travelable_stair(dungeon_feature_type feat)
     case DNGN_RETURN_FROM_SWAMP:
     case DNGN_RETURN_FROM_SHOALS:
     case DNGN_RETURN_FROM_SPIDER:
-    case DNGN_RETURN_FROM_FOREST:
     case DNGN_RETURN_FROM_DEPTHS:
         return true;
     default:
diff --git a/crawl-ref/source/tilepick.cc b/crawl-ref/source/tilepick.cc
index fe6e51cbc8..19b2f8c464 100644
--- a/crawl-ref/source/tilepick.cc
+++ b/crawl-ref/source/tilepick.cc
@@ -296,9 +296,9 @@ static tileidx_t _tileidx_feature_base(dungeon_feature_type feat)
     // branch entry stairs
 #if TAG_MAJOR_VERSION == 34
     case DNGN_ENTER_DWARF:
+    case DNGN_ENTER_FOREST:
 #endif
     case DNGN_ENTER_BLADE:
-    case DNGN_ENTER_FOREST:
         return TILE_DNGN_ENTER;
     case DNGN_ENTER_TEMPLE:
         return TILE_DNGN_ENTER_TEMPLE;
@@ -352,9 +352,9 @@ static tileidx_t _tileidx_feature_base(dungeon_feature_type feat)
     // branch exit stairs
 #if TAG_MAJOR_VERSION == 34
     case DNGN_RETURN_FROM_DWARF:
+    case DNGN_RETURN_FROM_FOREST:
 #endif
     case DNGN_RETURN_FROM_BLADE:
-    case DNGN_RETURN_FROM_FOREST:
         return TILE_DNGN_RETURN;
     case DNGN_RETURN_FROM_TEMPLE:
         return TILE_DNGN_EXIT_TEMPLE;
diff --git a/crawl-ref/source/tileview.cc b/crawl-ref/source/tileview.cc
index d56df0456c..b4efc2e027 100644
--- a/crawl-ref/source/tileview.cc
+++ b/crawl-ref/source/tileview.cc
@@ -192,11 +192,12 @@ void tile_default_flv(branch_type br, tile_flavour &flv)
         flv.floor = TILE_FLOOR_TOMB;
         return;
 
+#if TAG_MAJOR_VERSION == 34
     case BRANCH_FOREST:
         flv.wall  = TILE_WALL_LAIR;
         flv.floor = TILE_FLOOR_GRASS;
         return;
-
+#endif
     case BRANCH_ABYSS:
         flv.floor = tile_dngn_coloured(TILE_FLOOR_NERVES, env.floor_colour);
         switch (random2(6))
diff --git a/crawl-ref/source/viewmap.cc b/crawl-ref/source/viewmap.cc
index ae9dc9c8fd..3bcb24aa5b 100644
--- a/crawl-ref/source/viewmap.cc
+++ b/crawl-ref/source/viewmap.cc
@@ -172,6 +172,7 @@ bool is_feature(ucs_t feature, const coord_def& where)
         case DNGN_EXIT_DUNGEON:
 #if TAG_MAJOR_VERSION == 34
         case DNGN_RETURN_FROM_DWARF:
+        case DNGN_RETURN_FROM_FOREST:
 #endif
         case DNGN_RETURN_FROM_ORC:
         case DNGN_RETURN_FROM_LAIR:
@@ -186,7 +187,6 @@ bool is_feature(ucs_t feature, const coord_def& where)
         case DNGN_RETURN_FROM_SWAMP:
         case DNGN_RETURN_FROM_SHOALS:
         case DNGN_RETURN_FROM_SPIDER:
-        case DNGN_RETURN_FROM_FOREST:
 #if TAG_MAJOR_VERSION == 34
         case DNGN_EXIT_PORTAL_VAULT:
 #endif
@@ -204,6 +204,7 @@ bool is_feature(ucs_t feature, const coord_def& where)
         case DNGN_ABYSSAL_STAIR:
 #if TAG_MAJOR_VERSION == 34
         case DNGN_ENTER_DWARF:
+        case DNGN_ENTER_FOREST:
 #endif
         case DNGN_ENTER_ORC:
         case DNGN_ENTER_LAIR:
@@ -218,7 +219,6 @@ bool is_feature(ucs_t feature, const coord_def& where)
         case DNGN_ENTER_SWAMP:
         case DNGN_ENTER_SHOALS:
         case DNGN_ENTER_SPIDER:
-        case DNGN_ENTER_FOREST:
             return true;
         default:
             return false;
diff --git a/crawl-ref/source/zotdef.cc b/crawl-ref/source/zotdef.cc
index f8cf5646ee..8ad84370cc 100644
--- a/crawl-ref/source/zotdef.cc
+++ b/crawl-ref/source/zotdef.cc
@@ -77,8 +77,6 @@ static bool _is_branch_fitting(branch_type pb, int wavenum)
         return wavenum > 13;                 // 2.8K-
     case BRANCH_CRYPT:
         return wavenum > 15;                 // 3.2K-
-    case BRANCH_FOREST:
-        return wavenum > 20;                 // 4K-
     case BRANCH_SLIME:
         return wavenum > 20 && coinflip();   // 4K-
     case BRANCH_BLADE: