nethack-gwaa-kiwi/nethack
1
0
Fork 0
Code Pull Requests Activity

whatis / quick-whatis for '^'

Browse Source 
When using '//' or ';' to examine the map and player uses '^' to
move the cursor to the next displayed trap, have cursor go to
locations containing webs, the vibrating square, or other non-'^'
trap when such is the next trap symbol up.  Otherwise looking at
webs is very tedious because '"' is treated as a look-at command
rather than than a target symbol.
This commit is contained in:
PatR
2021-05-30 01:31:54 -07:00
parent 0fda8504bb
commit 494b374e12
2 changed files with 10 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
doc/fixes37.0
View File

@@ -1,4 +1,4 @@
NHDT-Branch: NetHack-3.7 $:$NHDT-Revision: 1.553 $ $NHDT-Date: 1622320390 2021/05/29 20:33:10 $ NHDT-Branch: NetHack-3.7 $:$NHDT-Revision: 1.554 $ $NHDT-Date: 1622363511 2021/05/30 08:31:51 $
General Fixes and Modified Features General Fixes and Modified Features
----------------------------------- -----------------------------------
@@ -534,6 +534,8 @@ make exploding spheres create an actual explosion
pets are more careful about attacking monsters at low health pets are more careful about attacking monsters at low health
allow killing your quest leader to open the quest allow killing your quest leader to open the quest
give King Arthur Excalibur give King Arthur Excalibur
when moving the cursor to examine the map, have '^' move to next trap even if
that trap is displayed with some other symbol (web, vibrating square)
Fixes to 3.7.0-x Problems that Were Exposed Via git Repository Fixes to 3.7.0-x Problems that Were Exposed Via git Repository

9
src/do_name.c
View File

@@ -1,4 +1,4 @@
/* NetHack 3.7 do_name.c $NHDT-Date: 1614818323 2021/03/04 00:38:43 $ $NHDT-Branch: NetHack-3.7 $:$NHDT-Revision: 1.198 $ */ /* NetHack 3.7 do_name.c $NHDT-Date: 1622363509 2021/05/30 08:31:49 $ $NHDT-Branch: NetHack-3.7 $:$NHDT-Revision: 1.202 $ */
/* Copyright (c) Stichting Mathematisch Centrum, Amsterdam, 1985. */ /* Copyright (c) Stichting Mathematisch Centrum, Amsterdam, 1985. */
/*-Copyright (c) Pasi Kallinen, 2018. */ /*-Copyright (c) Pasi Kallinen, 2018. */
/* NetHack may be freely redistributed. See license for details. */ /* NetHack may be freely redistributed. See license for details. */
@@ -884,7 +884,12 @@ getpos(coord *ccp, boolean force, const char *goal)
|| glyph_to_cmap(k) == S_corr || glyph_to_cmap(k) == S_corr
|| glyph_to_cmap(k) == S_litcorr) || glyph_to_cmap(k) == S_litcorr)
continue; continue;
if (c == defsyms[sidx].sym || c == (int) g.showsyms[sidx]) if (c == defsyms[sidx].sym
|| c == (int) g.showsyms[sidx]
/* have '^' match webs and vibrating square or any
other trap that uses something other than '^' */
|| (c == '^' && (is_cmap_trap(sidx)
|| sidx == S_vibrating_square)))
matching[sidx] = (char) ++k; matching[sidx] = (char) ++k;
} }
if (k) { if (k) {