B13009 - Teleport Control and confusion

Only allow level teleports to be controlled when not confused, just like
regular teleports.

diff --git a/doc/fixes34.1 b/doc/fixes34.1
index 537e04e725b2b5e2b5d757f6fc27034540a23c3e..05fd7a42032d0256ba480ff234aa318177629a3d 100644 (file)
--- a/doc/fixes34.1
+++ b/doc/fixes34.1
@@ -294,6 +294,7 @@ cancelled yellow lights should not explode against other monsters, as well as
        not exploding against you
 becoming confused, eg from nausia, while reading a spellbook should result
        in the usual confusion effects
+level teleports should not be controlled if you're confused
 
 
 Platform- and/or Interface-Specific Fixes

diff --git a/src/teleport.c b/src/teleport.c
index af1dc7aec28224c9bb1daedbab3c825237fa6ad8..0fde69e09f0a7ada880fc512b55982d134151247 100644 (file)
--- a/src/teleport.c
+++ b/src/teleport.c
@@ -556,7 +556,7 @@ level_tele()
            You_feel("very disoriented for a moment.");
            return;
        }
-       if (Teleport_control
+       if ((Teleport_control && !Confusion)
 #ifdef WIZARD
           || wizard
 #endif