summaryrefslogtreecommitdiffstats
path: root/trunk/source/spells3.cc
diff options
context:
space:
mode:
Diffstat (limited to 'trunk/source/spells3.cc')
-rw-r--r--trunk/source/spells3.cc4
1 files changed, 3 insertions, 1 deletions
diff --git a/trunk/source/spells3.cc b/trunk/source/spells3.cc
index fd6ea6043e..e2a2bf325f 100644
--- a/trunk/source/spells3.cc
+++ b/trunk/source/spells3.cc
@@ -613,6 +613,8 @@ void you_teleport2( bool allow_control, bool new_abyss_area )
if (current_delay_action() == DELAY_BUTCHER)
stop_delay();
+ interrupt_activity( AI_TELEPORT );
+
if (you.duration[DUR_CONDENSATION_SHIELD] > 0)
{
you.duration[DUR_CONDENSATION_SHIELD] = 0;
@@ -1059,7 +1061,7 @@ void portal(void)
you.your_level = target_level - 1;
grd[you.x_pos][you.y_pos] = DNGN_STONE_STAIRS_DOWN_I;
- down_stairs( true, old_level );
+ down_stairs( true, old_level, true );
untag_followers();
}