Remove some bizzare shaft generation code (minmay)

1 files changed, 0 insertions, 55 deletions

diff --git a/crawl-ref/source/dgn-layouts.cc b/crawl-ref/source/dgn-layouts.cc
index 57a837966d..b422cec007 100644
--- a/crawl-ref/source/dgn-layouts.cc
+++ b/crawl-ref/source/dgn-layouts.cc
@@ -97,61 +97,6 @@ void dgn_build_basic_level()
         upstairs.push_back(begin);
     }
 
-    // Generate a random dead-end that /may/ have a shaft.  Good luck!
-    if (is_valid_shaft_level() && !one_chance_in(4)) // 3/4 times
-    {
-        // This is kinda hack-ish.  We're still early in the dungeon
-        // generation process, and we know that there will be no other
-        // traps.  If we promise to make /just one/, we can get away
-        // with making this trap the first trap.
-        // If we aren't careful, we'll trigger an assert in _place_traps().
-
-        begin.reset(); end.reset();
-
-        _make_trail(50, 20, 40, 20, corrlength, intersect_chance, no_corr,
-                     begin, end);
-
-        dprf("Placing shaft trail...");
-        if (!end.origin())
-        {
-            if (!begin.origin())
-                upstairs.push_back(begin);
-            if (!one_chance_in(3) && !map_masked(end, MMT_NO_TRAP)) // 2/3 chance it ends in a shaft
-            {
-                trap_def* ts = NULL;
-                int i = 0;
-                for (; i < MAX_TRAPS; i++)
-                {
-                    if (env.trap[i].type != TRAP_UNASSIGNED)
-                        continue;
-
-                    ts = &env.trap[i];
-                    break;
-                }
-                if (i < MAX_TRAPS)
-                {
-                    ts->type = TRAP_SHAFT;
-                    ts->pos = end;
-                    grd(end) = DNGN_UNDISCOVERED_TRAP;
-                    env.tgrid(end) = i;
-                    if (shaft_known(level_number, false))
-                        ts->reveal();
-                    dprf("Trail ends in shaft.");
-                }
-                else
-                {
-                    grd(end) = DNGN_FLOOR;
-                    dprf("Trail does not end in shaft.");
-                }
-            }
-            else
-            {
-                grd(end) = DNGN_FLOOR;
-                dprf("Trail does not end in shaft.");
-            }
-        }
-    }
-
     for (vector<coord_def>::iterator pathstart = upstairs.begin();
          pathstart != upstairs.end(); pathstart++)
     {