diff options
| author | Pete Hurst <pete@streamuniverse.tv> | 2013-03-19 10:33:51 +0000 |
|---|---|---|
| committer | David Lawrence Ramsey <dolorous@users.sourceforge.net> | 2013-03-19 10:58:36 -0500 |
| commit | db2b50e94ba3b99453e79c68ea357b35059e4baa (patch) | |
| tree | 2a936db3648c8065867eb1b6fda6c62543dbf9b9 /crawl-ref/source/spl-transloc.cc | |
| parent | 5504a089ba5f20c75284c5c4944c83270e97aff5 (diff) | |
| download | crawl-ref-db2b50e94ba3b99453e79c68ea357b35059e4baa.tar.gz crawl-ref-db2b50e94ba3b99453e79c68ea357b35059e4baa.zip | |
#369 #3456 Mesmerisation applies -cTele
#369 advised degenerating cTele into rTele and it makes sense to apply the same for cBlink. It's probably not worth doing anything more complicated just for mesmerisation since cTele might get removed anyway at some point.
Diffstat (limited to 'crawl-ref/source/spl-transloc.cc')
| -rw-r--r-- | crawl-ref/source/spl-transloc.cc | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/crawl-ref/source/spl-transloc.cc b/crawl-ref/source/spl-transloc.cc index 3932f0057a..e022b899f9 100644 --- a/crawl-ref/source/spl-transloc.cc +++ b/crawl-ref/source/spl-transloc.cc @@ -351,13 +351,15 @@ void random_blink(bool allow_partial_control, bool override_abyss, bool override bool allow_control_teleport(bool quiet) { bool retval = !(testbits(env.level_flags, LFLAG_NO_TELE_CONTROL) - || orb_haloed(you.pos())); + || orb_haloed(you.pos()) || you.beheld()); // Tell the player why if they have teleport control. if (!quiet && !retval && player_control_teleport()) { if (orb_haloed(you.pos())) mpr("The orb prevents control of your teleportation!", MSGCH_ORB); + else if (you.beheld()) + mpr("It is impossible to concentrate on your destination whilst mesmerised."); else mpr("A powerful magic prevents control of your teleportation."); } |