diff options
| author | j-p-e-g <j-p-e-g@c06c8d41-db1a-0410-9941-cceddc491573> | 2009-05-31 21:06:01 +0000 |
|---|---|---|
| committer | j-p-e-g <j-p-e-g@c06c8d41-db1a-0410-9941-cceddc491573> | 2009-05-31 21:06:01 +0000 |
| commit | bca15bacae7209a2b75eb82aaf2578a1ce547f57 (patch) | |
| tree | d4ef2a744ae3a259dd9f83c2ff521c406122c46b /crawl-ref/source/misc.cc | |
| parent | 87c78aab3995cccfdcc41de3ac466b0fa2d85657 (diff) | |
| download | crawl-ref-bca15bacae7209a2b75eb82aaf2578a1ce547f57.tar.gz crawl-ref-bca15bacae7209a2b75eb82aaf2578a1ce547f57.zip | |
Commit r9867 to trunk.
git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@9868 c06c8d41-db1a-0410-9941-cceddc491573
Diffstat (limited to 'crawl-ref/source/misc.cc')
| -rw-r--r-- | crawl-ref/source/misc.cc | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/crawl-ref/source/misc.cc b/crawl-ref/source/misc.cc index 4ddd53ca1a..9f494299d1 100644 --- a/crawl-ref/source/misc.cc +++ b/crawl-ref/source/misc.cc @@ -3189,8 +3189,11 @@ void swap_with_monster(monsters *mon_to_swap) // Code copied from fire/ice in spl-cast.cc void maybe_id_ring_TC() { - if (player_mutation_level(MUT_TELEPORT_CONTROL)) + if (you.duration[DUR_CONTROL_TELEPORT] + || player_mutation_level(MUT_TELEPORT_CONTROL)) + { return; + } int num_unknown = 0; for (int i = EQ_LEFT_RING; i <= EQ_RIGHT_RING; ++i) |