From: PatR <rankin@nethack.org>
Date: Sat, 30 May 2015 19:30:54 +0000 (-0700)
Subject: disoriented teleport attempt
X-Git-Tag: NetHack-3.6.0_RC01~323^2~2
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=da64f26844685dff18e9735d1945063ffe2a04bb;p=nethack

disoriented teleport attempt

Reported for pre-beta, getting "you feel disoriented" when attempting
to teleport within a level while carrying the Amulet, you still ended
up teleporting.  Wizard mode allows the disorientation to be overridden
but the logic was wrong.  It worked as intended when in wizard mode but
unintentionally always overrode disorientation when not in that mode.
---

diff --git a/src/teleport.c b/src/teleport.c
index ade0ee291..146f9a68e 100644
--- a/src/teleport.c
+++ b/src/teleport.c
@@ -1,4 +1,4 @@
-/* NetHack 3.6	teleport.c	$NHDT-Date: 1432512774 2015/05/25 00:12:54 $  $NHDT-Branch: master $:$NHDT-Revision: 1.58 $ */
+/* NetHack 3.6	teleport.c	$NHDT-Date: 1433014241 2015/05/30 19:30:41 $  $NHDT-Branch: master $:$NHDT-Revision: 1.59 $ */
 /* Copyright (c) Stichting Mathematisch Centrum, Amsterdam, 1985. */
 /* NetHack may be freely redistributed.  See license for details. */
 
@@ -440,7 +440,7 @@ struct obj *scroll;
 
     if ((u.uhave.amulet || On_W_tower_level(&u.uz)) && !rn2(3)) {
         You_feel("disoriented for a moment.");
-        if (wizard && yn("Override?") != 'y')
+        if (!wizard || yn("Override?") != 'y')
             return FALSE;
     }
     if ((Teleport_control && !Stunned) || wizard) {