From 99558c580ce596e9d584912debf259d7e4bdc5b4 Mon Sep 17 00:00:00 2001 From: PatR Date: Sun, 3 Jul 2022 17:09:56 -0700 Subject: [PATCH 1/2] fixes entry for #810 - underwater food Pull request from entrez: non-swimming pets wouldn't target underwater food but if a flying pet happened to move over such food it would eat that. Fixes #810 --- doc/fixes3-7-0.txt | 2 ++ 1 file changed, 2 insertions(+) diff --git a/doc/fixes3-7-0.txt b/doc/fixes3-7-0.txt index bc58dc113..5fe66dbe3 100644 --- a/doc/fixes3-7-0.txt +++ b/doc/fixes3-7-0.txt @@ -948,6 +948,8 @@ a hero on the quest home level who runs or travels past the quest leader and gets tossed out of the quest for some reason would keep running on the far side of the quest portal allow rush/run over water if wearing discovered water walking boots +flying pets wouldn't target underwater food but if they happened to fly over + such food they could and would eat it Fixes to 3.7.0-x Problems that Were Exposed Via git Repository From 3e38c720ad6f62a4e2946bd9b692541827be5f3d Mon Sep 17 00:00:00 2001 From: Michael Meyer Date: Wed, 29 Jun 2022 20:13:45 -0400 Subject: [PATCH 2/2] Don't describe 'more info' prompt in #glance help When using #glance, the player is never prompted about whether she wants 'more info' about something on the map, even if flags.help is true and she has pressed '.' -- the 'more info' prompt is exclusive to #whatis. getpos_help already changed its description of '.' based on whether 'help' was on or off; adjust those criteria so that the description of the 'more info' prompt is only included for #whatis, where it is actually relevant. I recently looked at the help while using #glance and got confused about why the 'more info' prompt was never appearing, so hopefully this should help forestall that sort of thing. #glance also prompts only once, so there's some other information about "moving to another spot" in the help text which is not relevant -- that could definitely be addressed as well but I think it's less likely to be confusing, so I didn't bother with it in this commit. --- src/do_name.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/do_name.c b/src/do_name.c index 7c5d591e6..eaf58f23a 100644 --- a/src/do_name.c +++ b/src/do_name.c @@ -221,7 +221,7 @@ getpos_help(boolean force, const char *goal) Sprintf(sbuf, " '%s' describe current spot,%s move to another spot;", visctrl(g.Cmd.spkeys[NHKF_GETPOS_PICK]), - flags.help ? " prompt if 'more info'," : ""); + flags.help && !force ? " prompt if 'more info'," : ""); putstr(tmpwin, 0, sbuf); Sprintf(sbuf, " '%s' describe current spot, move to another spot;",