summaryrefslogtreecommitdiffstats
path: root/crawl-ref/source
diff options
context:
space:
mode:
Diffstat (limited to 'crawl-ref/source')
-rw-r--r--crawl-ref/source/delay.cc9
-rw-r--r--crawl-ref/source/spells4.cc6
2 files changed, 2 insertions, 13 deletions
diff --git a/crawl-ref/source/delay.cc b/crawl-ref/source/delay.cc
index 7b9133594b..7bc95d1429 100644
--- a/crawl-ref/source/delay.cc
+++ b/crawl-ref/source/delay.cc
@@ -419,15 +419,6 @@ void stop_delay( bool stop_stair_travel )
_pop_delay();
break;
- case DELAY_PASSWALL:
- // The lost work here is okay since this spell requires
- // the player to "attune to the rock". If changed, then
- // the delay should be increased to reduce the power of
- // this spell. -- bwr
- mpr( "Your meditation is interrupted." );
- _pop_delay();
- break;
-
case DELAY_MULTIDROP:
// No work lost
if (!items_for_multidrop.empty())
diff --git a/crawl-ref/source/spells4.cc b/crawl-ref/source/spells4.cc
index 3d58cdc192..b93f977425 100644
--- a/crawl-ref/source/spells4.cc
+++ b/crawl-ref/source/spells4.cc
@@ -1202,10 +1202,8 @@ static int _passwall(int x, int y, int pow, int garbage)
}
}
- // Note that the delay was (1 + howdeep * 2), but now that the
- // delay is stopped when the player is attacked it can be much
- // shorter since its harder to use for quick escapes. -- bwr
- start_delay( DELAY_PASSWALL, 2 + howdeep, nx, ny );
+ // Passwall delay is reduced, and the delay cannot be interrupted.
+ start_delay( DELAY_PASSWALL, 1 + howdeep, nx, ny );
return 1;
} // end passwall()