summaryrefslogtreecommitdiffstats
path: root/crawl-ref/source/misc.cc
diff options
context:
space:
mode:
authorj-p-e-g <j-p-e-g@c06c8d41-db1a-0410-9941-cceddc491573>2009-05-31 20:54:18 +0000
committerj-p-e-g <j-p-e-g@c06c8d41-db1a-0410-9941-cceddc491573>2009-05-31 20:54:18 +0000
commit3d526d1b18657a34d70710c613187c81046bf8e3 (patch)
tree3906b1e40b02f9113e704c6303d32f96aae97ef7 /crawl-ref/source/misc.cc
parentb756c0e3fea9fa20f2f659aed8217d6401fc331b (diff)
downloadcrawl-ref-3d526d1b18657a34d70710c613187c81046bf8e3.tar.gz
crawl-ref-3d526d1b18657a34d70710c613187c81046bf8e3.zip
Fix identifying =TC not taking into account the spell.
git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/branches/stone_soup-0.5@9867 c06c8d41-db1a-0410-9941-cceddc491573
Diffstat (limited to 'crawl-ref/source/misc.cc')
-rw-r--r--crawl-ref/source/misc.cc5
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)