From d5e5340c3926d1cf97f6cba151ffaecb20bfb35f Mon Sep 17 00:00:00 2001 From: dshaligram Date: Wed, 2 Aug 2006 12:54:15 +0000 Subject: Integrated travel patch as of 20060727 git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@7 c06c8d41-db1a-0410-9941-cceddc491573 --- trunk/source/spells3.cc | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'trunk/source/spells3.cc') 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(); } -- cgit v1.2.3-54-g00ecf