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

Merge branch 'NetHack-3.6'

Browse Source
This commit is contained in:
nhmall
2019-11-02 12:12:59 -04:00
parent 6d385661c0 91a8522871
commit 28a4c65caa
4 changed files with 45 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

48
doc/Guidebook.mn
View File

@@ -1,4 +1,4 @@
.\" $NHDT-Branch: NetHack-3.6 $:$NHDT-Revision: 1.319 $ $NHDT-Date: 1572525093 2019/10/31 12:31:33 $
.\" $NHDT-Branch: NetHack-3.6 $:$NHDT-Revision: 1.324 $ $NHDT-Date: 1572690738 2019/11/02 10:32:18 $
.\"
.\" This is an excerpt from the 'roff' man page from the 'groff' package.
.\" NetHack's Guidebook.mn currently does *not* adhere to these guidelines.
@@ -4405,16 +4405,23 @@ The special prefix form \\m switches on the meta bit in the symbol value,
and the \(ha prefix causes the following character to be treated as a
control character.
.pg
.\" Table is centered.
.\" First line (title) is left justified and spans second and third columns;
.\" it used to be centered but tended to look as if too far to the right.
.\" Remaining lines are left justified in each of three columns. First
.\" line (second overall) contains column labels; the first column has a
.\" dummy label of two spaces. (That used to be "Default" but it made all
.\" the lines wider because of the label's width and caused several lines
.\" to be too wide when generating plain text output. Two spaces leaves
.\" some room between the symbol character and name.) Entries in first
.\" column now use constant-width Roman font to approximate TeX tt font.
.TS S
center;
c s s
c1 l1 l.
l s s
l1fCR l1 l.
.\"TABLE_START
.\" because description is wide, centered title seems off, so pad it a bit
.\" note that each backslash precedes one space of padding (including the
.\" last one; in other words, there's a trailing space here)
NetHack Symbols\ \ \ \ \ \ \
Default Symbol Name Description
NetHack Symbols
\ \ Symbol Name Description
\_ \_ \_
\ S_air (air)
\&_ S_altar (altar)
@@ -4541,7 +4548,8 @@ s S_spider (arachnid or centipede)
@ S_ss3 (magic shield 3 of 4)
* S_ss4 (magic shield 4 of 4)
\(ha S_statue_trap (statue trap)
\ S_stone (dark part of a room)
\ S_stone (solid rock or unexplored terrain
\ \ \ or dark part of a room)
] S_strange_obj (strange object)
\- S_sw_bc (swallow bottom center)
\\ S_sw_bl (swallow bottom left)
@@ -4585,15 +4593,28 @@ v S_vortex (vortex)
w S_worm (worm)
\(ti S_worm_tail (long worm tail)
W S_wraith (wraith)
x S_xan (xan or other mythical/fantastic insect)
x S_xan (xan or other extraordinary insect)
X S_xorn (xorn)
Y S_yeti (apelike creature)
Z S_zombie (zombie)
z S_zruty (zruty)
\ S_pet_override (any pet if sysconf accessibility is set)
\ S_player_override (hero if sysconf accessibility is set)
\ S_pet_override (any pet if ACCESSIBILITY=1 is set)
\ S_player_override (hero if ACCESSIBILITY=1 is set)
.\"TABLE_END Do not delete this line.
.TE
.\" don't hyphenate file name across lines
.hw sysconf
.pg
Notes: several symbols in this table appear to be blank. They are the
space character, except for S_pet_override and S_player_override which
don't have any default value and can only be used if enabled in the
\(lqsysconf\(rq file.
.pg
S_rock is misleadingly named; rocks and stones use S_gem.
Statues and boulders are the rock being referred to, but since
version 3.6.0, statues are displayed as the monster they depict.
So S_rock is only used for boulders and not used at all if
overridden by the more specific S_boulder.
.pg
.hn 2
Configuring NetHack for Play by the Blind
@@ -4640,7 +4661,8 @@ See the previous section for the special symbols S_pet_override
to force a consistent symbol for all pets and
S_player_override to force a unique symbol for the player character
if \fBaccessibility\fP is enabled in the sysconf file.
The most crucial settings to make the game accessible are:
.pg
The most crucial settings to make the game more accessible are:
.pg
.lp symset:NHAccess
Load a symbol set appropriate for use by blind players.

1
doc/fixes36.3
View File

@@ -211,6 +211,7 @@ wizmakemap could leave genocided monsters on map
when entering Astral level, initial rendering of guardian angel didn't show
it as tame; noticeable if the level was entered with 'hilite_pet' On
fix a leashed pet polymorphed into a long worm staying leashed
prevent leashing unsolid monsters and monsters with no extremities
Fixes to Post-3.6.2 Problems that Were Exposed Via git Repository

13
src/apply.c
View File

@@ -585,15 +585,13 @@ unleash_all()
#define MAXLEASHED 2
/* TODO:
* This ought to exclude various other things, such as lights and gas
* spore, is_whirly() critters, ethereal creatures, possibly others.
*/
boolean
leashable(mtmp)
struct monst *mtmp;
{
return (boolean) (mtmp->mnum != PM_LONG_WORM);
return (boolean) (mtmp->mnum != PM_LONG_WORM
&& !unsolid(mtmp->data)
&& (!nolimbs(mtmp->data) || has_head(mtmp->data)));
}
/* ARGSUSED */
@@ -665,6 +663,11 @@ struct obj *obj;
if (mtmp->mleashed) {
pline("This %s is already leashed.",
spotmon ? l_monnam(mtmp) : "creature");
} else if (unsolid(mtmp->data)) {
pline("The leash would just fall off.");
} else if (nolimbs(mtmp->data) && !has_head(mtmp->data)) {
pline("%s has no extremities the leash would fit.",
Monnam(mtmp));
} else if (!leashable(mtmp)) {
pline("The leash won't fit onto %s%s.", spotmon ? "your " : "",
l_monnam(mtmp));

2
sys/winnt/Makefile.gcc
View File

@@ -510,7 +510,7 @@ endif
CFLAGSBASE = -c $(cflags) $(WINPINC) $(cdebug) $(CURSESDEF)
#LFLAGSBASEC = $(linkdebug)
#LFLAGSBASEG = $(linkdebug) -mwindows
baselibs = -lwinmm -lshell32 -lole32
baselibs = -lwinmm -lshell32 -lole32 -luuid
conlibs = -lgdi32 $(baselibs) $(BCRYPT)
guilibs = -lcomctl32 $(baselibs)
ifeq "$(WANT_WIN_QT4)" "Y"