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

rename S_player_override to S_hero_override

Browse Source
This commit is contained in:
PatR
2019-11-16 14:31:57 -08:00
parent 145ba8ec12
commit 2a07924063
9 changed files with 44 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
doc/Guidebook.mn
View File

@@ -1,4 +1,4 @@
.\" $NHDT-Branch: NetHack-3.6 $:$NHDT-Revision: 1.329 $ $NHDT-Date: 1573171723 2019/11/08 00:08:43 $ .\" $NHDT-Branch: NetHack-3.6 $:$NHDT-Revision: 1.331 $ $NHDT-Date: 1573943499 2019/11/16 22:31:39 $
.\" .\"
.\" This is an excerpt from the 'roff' man page from the 'groff' package. .\" This is an excerpt from the 'roff' man page from the 'groff' package.
.\" NetHack's Guidebook.mn currently does *not* adhere to these guidelines. .\" NetHack's Guidebook.mn currently does *not* adhere to these guidelines.
@@ -4615,7 +4615,7 @@ Y S_yeti (apelike creature)
Z S_zombie (zombie) Z S_zombie (zombie)
z S_zruty (zruty) z S_zruty (zruty)
\ S_pet_override (any pet if ACCESSIBILITY=1 is set) \ S_pet_override (any pet if ACCESSIBILITY=1 is set)
\ S_player_override (hero if ACCESSIBILITY=1 is set) \ S_hero_override (hero if ACCESSIBILITY=1 is set)
.\"TABLE_END Do not delete this line. .\"TABLE_END Do not delete this line.
.TE .TE
.\" don't hyphenate file name across lines .\" don't hyphenate file name across lines
@@ -4625,7 +4625,7 @@ z S_zruty (zruty)
.lp "*" .lp "*"
Several symbols in this table appear to be blank. Several symbols in this table appear to be blank.
They are the space character, except for S_pet_override They are the space character, except for S_pet_override
and S_player_override which don't have any default value and S_hero_override which don't have any default value
and can only be used if enabled in the \(lqsysconf\(rq file. and can only be used if enabled in the \(lqsysconf\(rq file.
.lp "*" .lp "*"
S_rock is misleadingly named; rocks and stones use S_gem. S_rock is misleadingly named; rocks and stones use S_gem.
@@ -4677,7 +4677,7 @@ and \fBROGUESYMBOLS=\fP
in your configuration file to better suit your preferences. in your configuration file to better suit your preferences.
See the previous section for the special symbols S_pet_override See the previous section for the special symbols S_pet_override
to force a consistent symbol for all pets and to force a consistent symbol for all pets and
S_player_override to force a unique symbol for the player character S_hero_override to force a unique symbol for the player character
if \fBaccessibility\fP is enabled in the sysconf file. if \fBaccessibility\fP is enabled in the sysconf file.
.pg .pg
The most crucial settings to make the game more accessible are: The most crucial settings to make the game more accessible are:

6
doc/Guidebook.tex
View File

@@ -5100,7 +5100,7 @@ Default & Symbol Name & Description\\
\verb@Z@ & S\verb+_+zombie & (zombie)\\ \verb@Z@ & S\verb+_+zombie & (zombie)\\
\verb@z@ & S\verb+_+zruty & (zruty)\\ \verb@z@ & S\verb+_+zruty & (zruty)\\
\verb@ @ & S\verb+_+pet\verb+_+override & (any pet if ACCESSIBILITY=1 is set)\\ \verb@ @ & S\verb+_+pet\verb+_+override & (any pet if ACCESSIBILITY=1 is set)\\
\verb@ @ & S\verb+_+player\verb+_+override & (hero if ACCESSIBILITY=1 is set) \verb@ @ & S\verb+_+hero\verb+_+override & (hero if ACCESSIBILITY=1 is set)
\end{longtable}% \end{longtable}%
} }
@@ -5111,7 +5111,7 @@ Notes:
%.lp "*" %.lp "*"
Several symbols in this table appear to be blank. Several symbols in this table appear to be blank.
They are the space character, except for S\verb+_+pet\verb+_+override They are the space character, except for S\verb+_+pet\verb+_+override
and S\verb+_+player\verb+_+override which don't have any default value and S\verb+_+hero\verb+_+override which don't have any default value
and can only be used if enabled in the ``sysconf'' file. and can only be used if enabled in the ``sysconf'' file.
%.lp "*" %.lp "*"
@@ -5165,7 +5165,7 @@ and with editing files, you may want to alter settings via {\it SYMBOLS=\/}
and {\it ROGUESYMBOLS=\/} and {\it ROGUESYMBOLS=\/}
in your configuration file to better suit your preferences. in your configuration file to better suit your preferences.
See the previous section for the special symbols S\verb+_+pet\verb+_+override See the previous section for the special symbols S\verb+_+pet\verb+_+override
to force a consistent symbol for all pets and S\verb+_+player\verb+_+override to force a consistent symbol for all pets and S\verb+_+hero\verb+_+override
to force a unique symbol for the player character if {\it accessibility\/} to force a unique symbol for the player character if {\it accessibility\/}
is enabled in the {\it sysconf\/} file. is enabled in the {\it sysconf\/} file.

3
doc/fixes36.3
View File

@@ -1,4 +1,4 @@
$NHDT-Branch: NetHack-3.6 $:$NHDT-Revision: 1.180 $ $NHDT-Date: 1573933605 2019/11/16 19:46:45 $ $NHDT-Branch: NetHack-3.6 $:$NHDT-Revision: 1.181 $ $NHDT-Date: 1573943506 2019/11/16 22:31:46 $
This fixes36.3 file is here to capture information about updates in the 3.6.x 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, lineage following the release of 3.6.2 in May 2019. Please note, however,
@@ -265,6 +265,7 @@ percentage highlighting for Xp broke up/down/changed highlighting for it;
deaf change to zap_over_floor needed to be restricted to player actions only deaf change to zap_over_floor needed to be restricted to player actions only
monster vs shade attack inflicted damage despite "passes harmlessly through" monster vs shade attack inflicted damage despite "passes harmlessly through"
fix for feedback from musical instruments played while deaf ignored whistles fix for feedback from musical instruments played while deaf ignored whistles
special map display symbol S_player_override renamed to S_hero_override
curses: sometimes the message window would show a blank line after a prompt curses: sometimes the message window would show a blank line after a prompt
curses: the change to show map in columns 1..79 instead of 2..80 made the curses: the change to show map in columns 1..79 instead of 2..80 made the
highlight for '@' show up in the wrong place if clipped map had been highlight for '@' show up in the wrong place if clipped map had been

4
include/rm.h
View File

@@ -1,4 +1,4 @@
/* NetHack 3.6 rm.h $NHDT-Date: 1571347960 2019/10/17 21:32:40 $ $NHDT-Branch: NetHack-3.6 $:$NHDT-Revision: 1.64 $ */ /* NetHack 3.6 rm.h $NHDT-Date: 1573943499 2019/11/16 22:31:39 $ $NHDT-Branch: NetHack-3.6 $:$NHDT-Revision: 1.66 $ */
/* Copyright (c) Stichting Mathematisch Centrum, Amsterdam, 1985. */ /* Copyright (c) Stichting Mathematisch Centrum, Amsterdam, 1985. */
/*-Copyright (c) Pasi Kallinen, 2017. */ /*-Copyright (c) Pasi Kallinen, 2017. */
/* NetHack may be freely redistributed. See license for details. */ /* NetHack may be freely redistributed. See license for details. */
@@ -267,7 +267,7 @@ struct symparse {
#define SYM_BOULDER 0 #define SYM_BOULDER 0
#define SYM_INVISIBLE 1 #define SYM_INVISIBLE 1
#define SYM_PET_OVERRIDE 2 #define SYM_PET_OVERRIDE 2
#define SYM_PLAYER_OVERRIDE 3 #define SYM_HERO_OVERRIDE 3
#define MAXOTHER 4 #define MAXOTHER 4
/* linked list of symsets and their characteristics */ /* linked list of symsets and their characteristics */

4
src/drawing.c
View File

@@ -1,4 +1,4 @@
/* NetHack 3.6 drawing.c $NHDT-Date: 1571347973 2019/10/17 21:32:53 $ $NHDT-Branch: NetHack-3.6 $:$NHDT-Revision: 1.62 $ */ /* NetHack 3.6 drawing.c $NHDT-Date: 1573943500 2019/11/16 22:31:40 $ $NHDT-Branch: NetHack-3.6 $:$NHDT-Revision: 1.64 $ */
/* Copyright (c) NetHack Development Team 1992. */ /* Copyright (c) NetHack Development Team 1992. */
/* NetHack may be freely redistributed. See license for details. */ /* NetHack may be freely redistributed. See license for details. */
@@ -817,7 +817,7 @@ struct symparse loadsyms[] = {
{ SYM_OTH, SYM_BOULDER + SYM_OFF_X, "S_boulder" }, { SYM_OTH, SYM_BOULDER + SYM_OFF_X, "S_boulder" },
{ SYM_OTH, SYM_INVISIBLE + SYM_OFF_X, "S_invisible" }, { SYM_OTH, SYM_INVISIBLE + SYM_OFF_X, "S_invisible" },
{ SYM_OTH, SYM_PET_OVERRIDE + SYM_OFF_X, "S_pet_override" }, { SYM_OTH, SYM_PET_OVERRIDE + SYM_OFF_X, "S_pet_override" },
{ SYM_OTH, SYM_PLAYER_OVERRIDE + SYM_OFF_X, "S_player_override" }, { SYM_OTH, SYM_HERO_OVERRIDE + SYM_OFF_X, "S_hero_override" },
{ 0, 0, (const char *) 0 } /* fence post */ { 0, 0, (const char *) 0 } /* fence post */
}; };

28
src/mapglyph.c
View File

@@ -1,4 +1,4 @@
/* NetHack 3.6 mapglyph.c $NHDT-Date: 1552945095 2019/03/18 21:38:15 $ $NHDT-Branch: NetHack-3.6.2-beta01 $:$NHDT-Revision: 1.48 $ */ /* NetHack 3.6 mapglyph.c $NHDT-Date: 1573943501 2019/11/16 22:31:41 $ $NHDT-Branch: NetHack-3.6 $:$NHDT-Revision: 1.51 $ */
/* Copyright (c) David Cohrs, 1991 */ /* Copyright (c) David Cohrs, 1991 */
/* NetHack may be freely redistributed. See license for details. */ /* NetHack may be freely redistributed. See license for details. */
@@ -66,7 +66,7 @@ unsigned *ospecial;
{ {
register int offset, idx; register int offset, idx;
int color = NO_COLOR; int color = NO_COLOR;
nhsym ch, ovsym; nhsym ch;
unsigned special = 0; unsigned special = 0;
/* condense multiple tests in macro version down to single */ /* condense multiple tests in macro version down to single */
boolean has_rogue_ibm_graphics = HAS_ROGUE_IBM_GRAPHICS, boolean has_rogue_ibm_graphics = HAS_ROGUE_IBM_GRAPHICS,
@@ -224,16 +224,20 @@ unsigned *ospecial;
/* These were requested by a blind player to enhance screen reader use */ /* These were requested by a blind player to enhance screen reader use */
if (sysopt.accessibility == 1) { if (sysopt.accessibility == 1) {
ovsym = Is_rogue_level(&u.uz) int ovidx;
? ov_rogue_syms[SYM_PET_OVERRIDE + SYM_OFF_X]
: ov_primary_syms[SYM_PET_OVERRIDE + SYM_OFF_X]; if ((special & MG_PET) != 0) {
if (ovsym && (special & MG_PET)) ovidx = SYM_PET_OVERRIDE + SYM_OFF_X;
idx = SYM_PET_OVERRIDE + SYM_OFF_X; if (Is_rogue_level(&u.uz) ? ov_rogue_syms[ovidx]
ovsym = Is_rogue_level(&u.uz) : ov_primary_syms[ovidx])
? ov_rogue_syms[SYM_PLAYER_OVERRIDE + SYM_OFF_X] idx = ovidx;
: ov_primary_syms[SYM_PLAYER_OVERRIDE + SYM_OFF_X]; }
if (ovsym && is_you) if (is_you) {
idx = SYM_PLAYER_OVERRIDE + SYM_OFF_X; ovidx = SYM_HERO_OVERRIDE + SYM_OFF_X;
if (Is_rogue_level(&u.uz) ? ov_rogue_syms[ovidx]
: ov_primary_syms[ovidx])
idx = ovidx;
}
} }
ch = showsyms[idx]; ch = showsyms[idx];

23
src/pager.c
View File

@@ -1,4 +1,4 @@
/* NetHack 3.6 pager.c $NHDT-Date: 1571531890 2019/10/20 00:38:10 $ $NHDT-Branch: NetHack-3.6 $:$NHDT-Revision: 1.157 $ */ /* NetHack 3.6 pager.c $NHDT-Date: 1573943502 2019/11/16 22:31:42 $ $NHDT-Branch: NetHack-3.6 $:$NHDT-Revision: 1.159 $ */
/* Copyright (c) Stichting Mathematisch Centrum, Amsterdam, 1985. */ /* Copyright (c) Stichting Mathematisch Centrum, Amsterdam, 1985. */
/*-Copyright (c) Robert Patrick Rankin, 2018. */ /*-Copyright (c) Robert Patrick Rankin, 2018. */
/* NetHack may be freely redistributed. See license for details. */ /* NetHack may be freely redistributed. See license for details. */
@@ -1053,27 +1053,27 @@ struct permonst **for_supplement;
break; break;
case SYM_PET_OVERRIDE + SYM_OFF_X: case SYM_PET_OVERRIDE + SYM_OFF_X:
if (looked) { if (looked) {
int oc = 0; int oc = 0, idx = SYM_PET_OVERRIDE + SYM_OFF_X;
unsigned os = 0; unsigned os = 0;
nhsym save_override; nhsym save_override;
if (Is_rogue_level(&u.uz)) { if (Is_rogue_level(&u.uz)) {
save_override = ov_rogue_syms[SYM_PET_OVERRIDE + SYM_OFF_X]; save_override = ov_rogue_syms[idx];
ov_rogue_syms[SYM_PET_OVERRIDE + SYM_OFF_X] = 0; ov_rogue_syms[idx] = 0;
} else { } else {
save_override = ov_primary_syms[SYM_PET_OVERRIDE + SYM_OFF_X]; save_override = ov_primary_syms[idx];
ov_primary_syms[SYM_PET_OVERRIDE + SYM_OFF_X] = 0; ov_primary_syms[idx] = 0;
} }
/* convert to symbol without the override in effect */ /* convert to symbol without override in effect */
(void) mapglyph(glyph, &sym, &oc, &os, cc.x, cc.y); (void) mapglyph(glyph, &sym, &oc, &os, cc.x, cc.y);
if (Is_rogue_level(&u.uz)) if (Is_rogue_level(&u.uz))
ov_rogue_syms[SYM_PET_OVERRIDE + SYM_OFF_X] = save_override; ov_rogue_syms[idx] = save_override;
else else
ov_primary_syms[SYM_PET_OVERRIDE + SYM_OFF_X] = save_override; ov_primary_syms[idx] = save_override;
goto check_monsters; goto check_monsters;
} }
break; break;
case SYM_PLAYER_OVERRIDE + SYM_OFF_X: case SYM_HERO_OVERRIDE + SYM_OFF_X:
sym = showsyms[S_HUMAN + SYM_OFF_M]; sym = showsyms[S_HUMAN + SYM_OFF_M];
goto check_monsters; goto check_monsters;
} }
@@ -1081,7 +1081,8 @@ struct permonst **for_supplement;
} }
#if 0 #if 0
/* handle optional boulder symbol as a special case */ /* handle optional boulder symbol as a special case */
if (o_syms[SYM_BOULDER + SYM_OFF_X] && sym == o_syms[SYM_BOULDER + SYM_OFF_X]) { if (o_syms[SYM_BOULDER + SYM_OFF_X]
&& sym == o_syms[SYM_BOULDER + SYM_OFF_X]) {
if (!found) { if (!found) {
*firstmatch = "boulder"; *firstmatch = "boulder";
Sprintf(out_str, "%s%s", prefix, an(*firstmatch)); Sprintf(out_str, "%s%s", prefix, an(*firstmatch));

4
sys/unix/sysconf
View File

@@ -1,4 +1,4 @@
# NetHack 3.6 sysconf $NHDT-Date: 1524689450 2018/04/25 20:50:50 $ $NHDT-Branch: NetHack-3.6.0 $:$NHDT-Revision: 1.27 $ # NetHack 3.6 sysconf $NHDT-Date: 1573943504 2019/11/16 22:31:44 $ $NHDT-Branch: NetHack-3.6 $:$NHDT-Revision: 1.31 $
# Copyright (c) 2015 by Kenneth Lorber, Kensington, Maryland # Copyright (c) 2015 by Kenneth Lorber, Kensington, Maryland
# NetHack may be freely redistributed. See license for details. # NetHack may be freely redistributed. See license for details.
# #
@@ -62,7 +62,7 @@ MAXPLAYERS=10
#SEDUCE=0 #SEDUCE=0
# Uncomment the next line to enable some accessibility features such # Uncomment the next line to enable some accessibility features such
# as S_player_override and S_pet_override symbols for screen readers # as S_hero_override and S_pet_override symbols for screen readers
# in the user config file. # in the user config file.
#ACCESSIBILITY=1 #ACCESSIBILITY=1

2
sys/winnt/sysconf.template
View File

@@ -53,7 +53,7 @@ WIZARDS=*
#SEDUCE=0 #SEDUCE=0
# Uncomment the next line to enable some accessibility features such # Uncomment the next line to enable some accessibility features such
# as S_player_override and S_pet_override symbols for screen readers # as S_hero_override and S_pet_override symbols for screen readers
# in the user config file. # in the user config file.
#ACCESSIBILITY=1 #ACCESSIBILITY=1