Merged trunk 1550 (banishment destroyed dungeon features) into 0.2 branch.

git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/branches/stone_soup-0.2@1551 c06c8d41-db1a-0410-9941-cceddc491573

7 files changed, 7 insertions, 11 deletions

diff --git a/crawl-ref/source/acr.cc b/crawl-ref/source/acr.cc
index 546ad520ce..36d5578318 100644
--- a/crawl-ref/source/acr.cc
+++ b/crawl-ref/source/acr.cc
@@ -498,7 +498,7 @@ static void handle_wizard_command( void )
             banished( DNGN_ENTER_ABYSS );
         else
         {
-            down_stairs(true, you.your_level, DNGN_EXIT_ABYSS);
+            down_stairs(you.your_level, DNGN_EXIT_ABYSS);
             untag_followers();
         }
         break;
diff --git a/crawl-ref/source/debug.cc b/crawl-ref/source/debug.cc
index 186fd309d8..829b7da0c8 100644
--- a/crawl-ref/source/debug.cc
+++ b/crawl-ref/source/debug.cc
@@ -411,8 +411,7 @@ void level_travel( int delta )
     }
 
     you.your_level = new_level - 1;
-    grd[you.x_pos][you.y_pos] = DNGN_STONE_STAIRS_DOWN_I;
-    down_stairs(true, old_level);
+    down_stairs(old_level, DNGN_STONE_STAIRS_DOWN_I);
     untag_followers();
 }                               // end level_travel()
 
diff --git a/crawl-ref/source/delay.cc b/crawl-ref/source/delay.cc
index 0175fb29aa..922d624d42 100644
--- a/crawl-ref/source/delay.cc
+++ b/crawl-ref/source/delay.cc
@@ -622,7 +622,7 @@ static void finish_delay(const delay_queue_item &delay)
         break;
 
     case DELAY_DESCENDING_STAIRS:
-        down_stairs( false, delay.parm1 );
+        down_stairs( delay.parm1 );
         untag_followers();
         break;
 
diff --git a/crawl-ref/source/effects.cc b/crawl-ref/source/effects.cc
index 04ba728117..b366a94be8 100644
--- a/crawl-ref/source/effects.cc
+++ b/crawl-ref/source/effects.cc
@@ -152,7 +152,7 @@ void banished(int gate_type, const std::string &who)
         take_note(Note(NOTE_USER_NOTE, 0, 0, what.c_str()), true);
     }
 
-    down_stairs(true, you.your_level, gate_type);  // heh heh
+    down_stairs(you.your_level, gate_type);  // heh heh
     untag_followers(); // safety
 }                               // end banished()
 
diff --git a/crawl-ref/source/misc.cc b/crawl-ref/source/misc.cc
index 2b67321f17..d253d3859e 100644
--- a/crawl-ref/source/misc.cc
+++ b/crawl-ref/source/misc.cc
@@ -729,7 +729,7 @@ void up_stairs(void)
     }
 }                               // end up_stairs()
 
-void down_stairs( bool remove_stairs, int old_level, int force_stair )
+void down_stairs( int old_level, int force_stair )
 {
     int i;
     char old_level_type = you.level_type;
@@ -956,9 +956,6 @@ void down_stairs( bool remove_stairs, int old_level, int force_stair )
     if (you.level_type == LEVEL_PANDEMONIUM)
         stair_taken = DNGN_TRANSIT_PANDEMONIUM;
 
-    if (remove_stairs)
-        grd[you.x_pos][you.y_pos] = DNGN_FLOOR;
-
     switch (you.level_type)
     {
     case LEVEL_LABYRINTH:
diff --git a/crawl-ref/source/misc.h b/crawl-ref/source/misc.h
index 7eeac53e24..81d893ff5a 100644
--- a/crawl-ref/source/misc.h
+++ b/crawl-ref/source/misc.h
@@ -43,7 +43,7 @@ void disarm_trap(struct dist &disa);
 /* ***********************************************************************
  * called from: acr - effects - spells3
  * *********************************************************************** */
-void down_stairs(bool remove_stairs, int old_level, int force_stair = 0);
+void down_stairs(int old_level, int force_stair = 0);
 
 
 // last updated 12may2000 {dlb}
diff --git a/crawl-ref/source/spells3.cc b/crawl-ref/source/spells3.cc
index 2561f94a24..e91417d83e 100644
--- a/crawl-ref/source/spells3.cc
+++ b/crawl-ref/source/spells3.cc
@@ -1057,7 +1057,7 @@ int portal(void)
 
         you.your_level = target_level - 1;
 
-        down_stairs( true, old_level, DNGN_STONE_STAIRS_DOWN_I );
+        down_stairs( old_level, DNGN_STONE_STAIRS_DOWN_I );
         untag_followers();
     }