summaryrefslogtreecommitdiffstats
path: root/crawl-ref
diff options
context:
space:
mode:
Diffstat (limited to 'crawl-ref')
-rw-r--r--crawl-ref/source/acr.cc2
-rw-r--r--crawl-ref/source/debug.cc3
-rw-r--r--crawl-ref/source/delay.cc2
-rw-r--r--crawl-ref/source/effects.cc2
-rw-r--r--crawl-ref/source/misc.cc5
-rw-r--r--crawl-ref/source/misc.h2
-rw-r--r--crawl-ref/source/spells3.cc2
7 files changed, 7 insertions, 11 deletions
diff --git a/crawl-ref/source/acr.cc b/crawl-ref/source/acr.cc
index 3a3a9548b9..25757b00fa 100644
--- a/crawl-ref/source/acr.cc
+++ b/crawl-ref/source/acr.cc
@@ -506,7 +506,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 d84590d1e6..98a0a85542 100644
--- a/crawl-ref/source/debug.cc
+++ b/crawl-ref/source/debug.cc
@@ -416,8 +416,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 70896b8f78..b0698284b5 100644
--- a/crawl-ref/source/delay.cc
+++ b/crawl-ref/source/delay.cc
@@ -609,7 +609,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 fb59f24bd5..c3fdf3aa29 100644
--- a/crawl-ref/source/effects.cc
+++ b/crawl-ref/source/effects.cc
@@ -153,7 +153,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
if (gate_type == DNGN_ENTER_ABYSS || gate_type == DNGN_ENTER_PANDEMONIUM)
diff --git a/crawl-ref/source/misc.cc b/crawl-ref/source/misc.cc
index 1c030dbb27..3faf5a1600 100644
--- a/crawl-ref/source/misc.cc
+++ b/crawl-ref/source/misc.cc
@@ -731,7 +731,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;
@@ -955,9 +955,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 0fa10e8421..207ea1b6f3 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 36f05cbd25..503c967aa4 100644
--- a/crawl-ref/source/spells3.cc
+++ b/crawl-ref/source/spells3.cc
@@ -1058,7 +1058,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();
}