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

4 files changed, 13 insertions, 9 deletions

diff --git a/crawl-ref/docs/key_changes.txt b/crawl-ref/docs/key_changes.txt
index 9a1d1639ff..8f56e1bc95 100644
--- a/crawl-ref/docs/key_changes.txt
+++ b/crawl-ref/docs/key_changes.txt
@@ -14,6 +14,7 @@ are nowadays activated with V.)
                        within range
             Ctrl-X     lists monsters, items and features in sight
             Ctrl-S     saves game without prompt (was Ctrl-X)
+
             On the level map (X):
             e          set/remove travel exclusion (was Ctrl-X)
             E          cycle travel exclusions (was x)
@@ -33,7 +34,7 @@ press the key matching an item’s slot in order to examine it.
 When chopping up a single corpse on the ground, there is no longer any prompt.
 You will only be prompted if there are two or more corpses. When answering this
 prompt, you can use the following shortcuts: c means yes, so you can press
-cccc. . . to chop up all corpses in one place, or you can just hit a to butcher
+cccc... to chop up all corpses in one place, or you can just hit a to butcher
 of corpses on a square.
 
 The * Direction and Ctrl-Direction keys now both open and close doors.
@@ -47,7 +48,7 @@ The * Direction and Ctrl-Direction keys now both open and close doors.
                  0           repeat next command
                  V           verbose list of monsters in sight
                  Ctrl-T      toggle ally pickup mode (only for permanent allies)
-                 Ctrl-D      add macro (a new synonym for ∼)
+                 Ctrl-D      add macro (a new synonym for ~)
                  new key     command                   old key
                  z           cast spell                was Z
                  Z           zap wand                  was z
@@ -94,4 +95,4 @@ Note that the header of init.txt contains these lines. (It contains some more
 options for using other old settings.) The options are commented out, so you
 just need to remove the # in front in order to activate them. You can choose to
 use only part of these options. In case you decide to use the old keyset, be
-aware that D and d are synonyms for ’yes’ in the butcher interface.
+aware that D and d are synonyms for 'yes' in the butcher interface.
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)
diff --git a/crawl-ref/source/mstuff2.cc b/crawl-ref/source/mstuff2.cc
index a6226acecd..56acbc2177 100644
--- a/crawl-ref/source/mstuff2.cc
+++ b/crawl-ref/source/mstuff2.cc
@@ -581,7 +581,7 @@ void mons_cast_noise(monsters *monster, bolt &pbolt, spell_type spell_cast)
     const bool priest = mons_class_flag(monster->type, M_PRIEST);
     const bool wizard = mons_class_flag(monster->type, M_ACTUAL_SPELLS);
     const bool innate = !(priest || wizard || no_silent)
-                       || (flags & SPFLAG_INNATE);
+                        || (flags & SPFLAG_INNATE);
 
     int noise;
     if (silent
diff --git a/crawl-ref/source/player.cc b/crawl-ref/source/player.cc
index d986ff62be..1c1fae0b70 100644
--- a/crawl-ref/source/player.cc
+++ b/crawl-ref/source/player.cc
@@ -1558,10 +1558,10 @@ bool player_res_asphyx()
 
 bool player_control_teleport(bool calc_unid, bool temp, bool items)
 {
-    return ( (you.duration[DUR_CONTROL_TELEPORT] && temp)
-             || (player_equip(EQ_RINGS, RING_TELEPORT_CONTROL, calc_unid)
-                 && items)
-             || player_mutation_level(MUT_TELEPORT_CONTROL) );
+    return ((temp && you.duration[DUR_CONTROL_TELEPORT])
+            || (items
+                && player_equip(EQ_RINGS, RING_TELEPORT_CONTROL, calc_unid))
+            || player_mutation_level(MUT_TELEPORT_CONTROL));
 }
 
 int player_res_torment(bool)