diff options
| author | j-p-e-g <j-p-e-g@c06c8d41-db1a-0410-9941-cceddc491573> | 2008-02-02 19:57:43 +0000 |
|---|---|---|
| committer | j-p-e-g <j-p-e-g@c06c8d41-db1a-0410-9941-cceddc491573> | 2008-02-02 19:57:43 +0000 |
| commit | 73e93cb36fd23c84328abe78555a35009a57d2e7 (patch) | |
| tree | 1545802d84da3401728b0bb55adc7dc16bde5dd7 /crawl-ref/source/traps.cc | |
| parent | 37a4ac33578a9a8e9366ce1e0686dbea42dc66b8 (diff) | |
| download | crawl-ref-73e93cb36fd23c84328abe78555a35009a57d2e7.tar.gz crawl-ref-73e93cb36fd23c84328abe78555a35009a57d2e7.zip | |
Make being caught in a net interrupt the stair delay, and disallow beholding
attempts (mermaid) while the player is taking some stairs.
Also add a message for wielding a weapon of distortion. (I'm afraid there
already used to be one that I've accidentally removed.)
git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@3385 c06c8d41-db1a-0410-9941-cceddc491573
Diffstat (limited to 'crawl-ref/source/traps.cc')
| -rw-r--r-- | crawl-ref/source/traps.cc | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/crawl-ref/source/traps.cc b/crawl-ref/source/traps.cc index 2635663816..ffa51a64e1 100644 --- a/crawl-ref/source/traps.cc +++ b/crawl-ref/source/traps.cc @@ -17,6 +17,7 @@ #include "beam.h" #include "branch.h" +#include "delay.h" #include "direct.h" #include "it_use2.h" #include "items.h" @@ -171,6 +172,8 @@ void player_caught_in_net() mpr("You fall like a stone!"); fall_into_a_pool(you.x_pos, you.y_pos, false, grd(you.pos())); } + + stop_delay(true); // even stair delays } } |