diff options
| author | Chris Campbell <chriscampbell89@gmail.com> | 2011-11-10 22:16:15 +0000 |
|---|---|---|
| committer | Chris Campbell <chriscampbell89@gmail.com> | 2011-11-10 22:16:33 +0000 |
| commit | 39aa805b401e889169479cb51daff13921e4534a (patch) | |
| tree | 35d3ad9cae1c9b2bb1945ab7b93ca1e73e6197dc /crawl-ref/source/teleport.cc | |
| parent | 5e112b11a3d8970a592942db3543b0078e5f813f (diff) | |
| download | crawl-ref-39aa805b401e889169479cb51daff13921e4534a.tar.gz crawl-ref-39aa805b401e889169479cb51daff13921e4534a.zip | |
Interrupt passwall when hit by dispersal or otherwise blinked
Diffstat (limited to 'crawl-ref/source/teleport.cc')
| -rw-r--r-- | crawl-ref/source/teleport.cc | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/crawl-ref/source/teleport.cc b/crawl-ref/source/teleport.cc index 9121d64c2b..68b277525b 100644 --- a/crawl-ref/source/teleport.cc +++ b/crawl-ref/source/teleport.cc @@ -10,6 +10,7 @@ #include "cloud.h" #include "coord.h" #include "coordit.h" +#include "delay.h" #include "env.h" #include "fprop.h" #include "item_use.h" @@ -41,6 +42,8 @@ bool player::blink_to(const coord_def& dest, bool quiet) if (!quiet) canned_msg(MSG_YOU_BLINK); + stop_delay(true); + const coord_def origin = pos(); move_player_to_grid(dest, false, true); |