From 4201c21d23c3044f2521e182f7086054247258c2 Mon Sep 17 00:00:00 2001 From: PatR Date: Thu, 16 May 2019 15:26:35 -0700 Subject: [PATCH] farlook feedback for overloaded symbols When using '/' or ';' and picking--not just viewing the autodescribe feedback for--a space or '#' on the map, the game would produce That can be many things (stone) or That can be many things (corridor) unlike the usual - the interior of a monster or a wall or an open door (wall) when the symbol matched more than 4 things. I first changed it to append the full sentence's missing period, but ultimately switched to # can be many things (corridor) so that the symbol that "many things" refers to isn't hidden. This works better for ^P where player isn't looking at the symbol anymore. --- doc/fixes36.3 | 4 +++- src/pager.c | 7 +++++-- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/doc/fixes36.3 b/doc/fixes36.3 index c17abf893..07ab11624 100644 --- a/doc/fixes36.3 +++ b/doc/fixes36.3 @@ -1,4 +1,4 @@ -$NHDT-Branch: NetHack-3.6 $:$NHDT-Revision: 1.1 $ $NHDT-Date: 1557569075 2019/05/11 10:04:35 $ +$NHDT-Branch: NetHack-3.6 $:$NHDT-Revision: 1.3 $ $NHDT-Date: 1558045586 2019/05/16 22:26:26 $ 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, @@ -11,6 +11,8 @@ when place_object() puts a non-boulder on the map at a spot which contains other objects, put it under all boulders in the pile rather than just under the top one; previously, map wasn't showing a boulder there if the top one got moved by means other than pushing +when examining the map with '/' or ';', picking a symbol which is used for + more than 4 things yielded a sentence lacking its terminating period Fixes to Post-3.6.2 Problems that Were Exposed Via git Repository diff --git a/src/pager.c b/src/pager.c index 5ca886df6..ce1aae41b 100644 --- a/src/pager.c +++ b/src/pager.c @@ -1,4 +1,4 @@ -/* NetHack 3.6 pager.c $NHDT-Date: 1555627307 2019/04/18 22:41:47 $ $NHDT-Branch: NetHack-3.6.2-beta01 $:$NHDT-Revision: 1.151 $ */ +/* NetHack 3.6 pager.c $NHDT-Date: 1558045586 2019/05/16 22:26:26 $ $NHDT-Branch: NetHack-3.6 $:$NHDT-Revision: 1.153 $ */ /* Copyright (c) Stichting Mathematisch Centrum, Amsterdam, 1985. */ /*-Copyright (c) Robert Patrick Rankin, 2018. */ /* NetHack may be freely redistributed. See license for details. */ @@ -1042,7 +1042,10 @@ struct permonst **for_supplement; */ if (found > 4) - Sprintf(out_str, "%s", "That can be many things"); + /* 3.6.3: this used to be "That can be many things" (without prefix) + which turned it into a sentence that lacked its terminating period; + we could add one below but reinstating the prefix here is better */ + Sprintf(out_str, "%scan be many things", prefix); didlook: if (looked) {