From 8cf70f77710e73c400bec5bb4a4aa8f6719b446d Mon Sep 17 00:00:00 2001
From: PatR <rankin@nethack.org>
Date: Mon, 2 Sep 2019 02:59:09 -0700
Subject: [PATCH] fix github issue 217 - monster spellcasting feedback

Fixes #217

Feedback when spellcasting monster aimed at the wrong spot due to not
being able to see an invisible hero only gave the intended message if
hero couldn't see self.  The code was using 'if (Invisible)' which
checks whether the hero is invisible and can't see invisible, when it
should have been using 'if (Invis)' which just tests whether the hero
is invisible.

It wouldn't surprise if the same problem occurs elsewhere.  Those
macros are rather error prone.

The issue report mentions that one of the affected messages might be
unreachable.  I didn't investigate that.
---
 doc/fixes36.3 |  5 ++++-
 src/mcastu.c  | 26 +++++++++++++-------------
 2 files changed, 17 insertions(+), 14 deletions(-)

diff --git a/doc/fixes36.3 b/doc/fixes36.3
index 14df3035f..f51350117 100644
--- a/doc/fixes36.3
+++ b/doc/fixes36.3
@@ -1,4 +1,4 @@
-$NHDT-Branch: NetHack-3.6 $:$NHDT-Revision: 1.107 $ $NHDT-Date: 1567302620 2019/09/01 01:50:20 $
+$NHDT-Branch: NetHack-3.6 $:$NHDT-Revision: 1.108 $ $NHDT-Date: 1567418344 2019/09/02 09:59:04 $
 
 This fixes36.3 file is here to capture information about updates in the 3.6.x
 lineage following the release of 3.6.2 in May 2019. Please note, however,
@@ -133,6 +133,9 @@ have 'O' update persistent inventory window if 'implicit_uncursed',
 'O's "set <option> to what?" could be used to force a buffer overflow
 'O's response to bad 'statuslines' value said "must be 2 and 3" (at one point
 	it was "must be between 2 and 3", change it to "must be 2 or 3")
+when spellcasting monster aimed at wrong spot due to not being able to see
+	invisible hero, feedback could be erroneous if hero could see self
+	[messages used 'if (Invisible)' test where 'if (Invis)' was meant]
 
 
 Fixes to Post-3.6.2 Problems that Were Exposed Via git Repository
diff --git a/src/mcastu.c b/src/mcastu.c
index 1f73638ee..652a6105a 100644
--- a/src/mcastu.c
+++ b/src/mcastu.c
@@ -1,4 +1,4 @@
-/* NetHack 3.6	mcastu.c	$NHDT-Date: 1436753517 2015/07/13 02:11:57 $  $NHDT-Branch: master $:$NHDT-Revision: 1.44 $ */
+/* NetHack 3.6	mcastu.c	$NHDT-Date: 1567418129 2019/09/02 09:55:29 $  $NHDT-Branch: NetHack-3.6 $:$NHDT-Revision: 1.55 $ */
 /* Copyright (c) Stichting Mathematisch Centrum, Amsterdam, 1985. */
 /*-Copyright (c) Robert Patrick Rankin, 2011. */
 /* NetHack may be freely redistributed.  See license for details. */
@@ -264,7 +264,7 @@ boolean foundyou;
               canspotmon(mtmp) ? Monnam(mtmp) : "Something",
               is_undirected_spell(mattk->adtyp, spellnum)
                   ? ""
-                  : (Invisible && !perceives(mtmp->data)
+                  : (Invis && !perceives(mtmp->data)
                      && (mtmp->mux != u.ux || mtmp->muy != u.uy))
                         ? " at a spot near you"
                         : (Displaced
@@ -406,15 +406,15 @@ int spellnum;
         int count;
 
         count = nasty(mtmp); /* summon something nasty */
-        if (mtmp->iswiz)
+        if (mtmp->iswiz) {
             verbalize("Destroy the thief, my pet%s!", plur(count));
-        else {
-            const char *mappear =
-                (count == 1) ? "A monster appears" : "Monsters appear";
+        } else {
+            const char *mappear = (count == 1) ? "A monster appears"
+                                               : "Monsters appear";
 
             /* messages not quite right if plural monsters created but
                only a single monster is seen */
-            if (Invisible && !perceives(mtmp->data)
+            if (Invis && !perceives(mtmp->data)
                 && (mtmp->mux != u.ux || mtmp->muy != u.uy))
                 pline("%s around a spot near you!", mappear);
             else if (Displaced && (mtmp->mux != u.ux || mtmp->muy != u.uy))
@@ -631,16 +631,16 @@ int spellnum;
                     pline("%s %s.", upstart(arg), vtense(arg, "appear"));
             }
 
-            /* seen caster, possibly producing unseen--or just one--critters;
-               hero is told what the caster is doing and doesn't necessarily
-               observe complete accuracy of that caster's results (in other
-               words, no need to fuss with visibility or singularization;
-               player is told what's happening even if hero is unconscious) */
+        /* seen caster, possibly producing unseen--or just one--critters;
+           hero is told what the caster is doing and doesn't necessarily
+           observe complete accuracy of that caster's results (in other
+           words, no need to fuss with visibility or singularization;
+           player is told what's happening even if hero is unconscious) */
         } else if (!success)
             fmt = "%s casts at a clump of sticks, but nothing happens.";
         else if (let == S_SNAKE)
             fmt = "%s transforms a clump of sticks into snakes!";
-        else if (Invisible && !perceives(mtmp->data)
+        else if (Invis && !perceives(mtmp->data)
                  && (mtmp->mux != u.ux || mtmp->muy != u.uy))
             fmt = "%s summons insects around a spot near you!";
         else if (Displaced && (mtmp->mux != u.ux || mtmp->muy != u.uy))