From 2a079240631a724e2ff5e047d3fde002dac00ad4 Mon Sep 17 00:00:00 2001 From: PatR Date: Sat, 16 Nov 2019 14:31:57 -0800 Subject: [PATCH] rename S_player_override to S_hero_override --- doc/Guidebook.mn | 8 ++++---- doc/Guidebook.tex | 6 +++--- doc/fixes36.3 | 3 ++- include/rm.h | 4 ++-- src/drawing.c | 4 ++-- src/mapglyph.c | 28 ++++++++++++++++------------ src/pager.c | 23 ++++++++++++----------- sys/unix/sysconf | 4 ++-- sys/winnt/sysconf.template | 2 +- 9 files changed, 44 insertions(+), 38 deletions(-) diff --git a/doc/Guidebook.mn b/doc/Guidebook.mn index f3a8a9818..e61a2f78c 100644 --- a/doc/Guidebook.mn +++ b/doc/Guidebook.mn @@ -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. .\" 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_zruty (zruty) \ 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. .TE .\" don't hyphenate file name across lines @@ -4625,7 +4625,7 @@ z S_zruty (zruty) .lp "*" 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 S_hero_override which don't have any default value and can only be used if enabled in the \(lqsysconf\(rq file. .lp "*" 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. 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 +S_hero_override to force a unique symbol for the player character if \fBaccessibility\fP is enabled in the sysconf file. .pg The most crucial settings to make the game more accessible are: diff --git a/doc/Guidebook.tex b/doc/Guidebook.tex index 290373dae..4c42b06f1 100644 --- a/doc/Guidebook.tex +++ b/doc/Guidebook.tex @@ -5100,7 +5100,7 @@ Default & Symbol Name & Description\\ \verb@Z@ & S\verb+_+zombie & (zombie)\\ \verb@z@ & S\verb+_+zruty & (zruty)\\ \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}% } @@ -5111,7 +5111,7 @@ Notes: %.lp "*" Several symbols in this table appear to be blank. 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. %.lp "*" @@ -5165,7 +5165,7 @@ and with editing files, you may want to alter settings via {\it SYMBOLS=\/} and {\it ROGUESYMBOLS=\/} in your configuration file to better suit your preferences. 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\/} is enabled in the {\it sysconf\/} file. diff --git a/doc/fixes36.3 b/doc/fixes36.3 index 302dd0e0c..1b2caaebf 100644 --- a/doc/fixes36.3 +++ b/doc/fixes36.3 @@ -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 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 monster vs shade attack inflicted damage despite "passes harmlessly through" 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: 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 diff --git a/include/rm.h b/include/rm.h index 1d27c95e9..37b3fff7d 100644 --- a/include/rm.h +++ b/include/rm.h @@ -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) Pasi Kallinen, 2017. */ /* NetHack may be freely redistributed. See license for details. */ @@ -267,7 +267,7 @@ struct symparse { #define SYM_BOULDER 0 #define SYM_INVISIBLE 1 #define SYM_PET_OVERRIDE 2 -#define SYM_PLAYER_OVERRIDE 3 +#define SYM_HERO_OVERRIDE 3 #define MAXOTHER 4 /* linked list of symsets and their characteristics */ diff --git a/src/drawing.c b/src/drawing.c index 91bd3d3b4..ca5283835 100644 --- a/src/drawing.c +++ b/src/drawing.c @@ -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. */ /* 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_INVISIBLE + SYM_OFF_X, "S_invisible" }, { 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 */ }; diff --git a/src/mapglyph.c b/src/mapglyph.c index 6245a4847..d6a78bc22 100644 --- a/src/mapglyph.c +++ b/src/mapglyph.c @@ -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 */ /* NetHack may be freely redistributed. See license for details. */ @@ -66,7 +66,7 @@ unsigned *ospecial; { register int offset, idx; int color = NO_COLOR; - nhsym ch, ovsym; + nhsym ch; unsigned special = 0; /* condense multiple tests in macro version down to single */ 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 */ if (sysopt.accessibility == 1) { - ovsym = Is_rogue_level(&u.uz) - ? ov_rogue_syms[SYM_PET_OVERRIDE + SYM_OFF_X] - : ov_primary_syms[SYM_PET_OVERRIDE + SYM_OFF_X]; - if (ovsym && (special & MG_PET)) - idx = SYM_PET_OVERRIDE + SYM_OFF_X; - ovsym = Is_rogue_level(&u.uz) - ? ov_rogue_syms[SYM_PLAYER_OVERRIDE + SYM_OFF_X] - : ov_primary_syms[SYM_PLAYER_OVERRIDE + SYM_OFF_X]; - if (ovsym && is_you) - idx = SYM_PLAYER_OVERRIDE + SYM_OFF_X; + int ovidx; + + if ((special & MG_PET) != 0) { + ovidx = SYM_PET_OVERRIDE + SYM_OFF_X; + if (Is_rogue_level(&u.uz) ? ov_rogue_syms[ovidx] + : ov_primary_syms[ovidx]) + idx = ovidx; + } + if (is_you) { + 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]; diff --git a/src/pager.c b/src/pager.c index 531ca122b..647df5150 100644 --- a/src/pager.c +++ b/src/pager.c @@ -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) Robert Patrick Rankin, 2018. */ /* NetHack may be freely redistributed. See license for details. */ @@ -1053,27 +1053,27 @@ struct permonst **for_supplement; break; case SYM_PET_OVERRIDE + SYM_OFF_X: if (looked) { - int oc = 0; + int oc = 0, idx = SYM_PET_OVERRIDE + SYM_OFF_X; unsigned os = 0; nhsym save_override; if (Is_rogue_level(&u.uz)) { - save_override = ov_rogue_syms[SYM_PET_OVERRIDE + SYM_OFF_X]; - ov_rogue_syms[SYM_PET_OVERRIDE + SYM_OFF_X] = 0; + save_override = ov_rogue_syms[idx]; + ov_rogue_syms[idx] = 0; } else { - save_override = ov_primary_syms[SYM_PET_OVERRIDE + SYM_OFF_X]; - ov_primary_syms[SYM_PET_OVERRIDE + SYM_OFF_X] = 0; + save_override = ov_primary_syms[idx]; + 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); if (Is_rogue_level(&u.uz)) - ov_rogue_syms[SYM_PET_OVERRIDE + SYM_OFF_X] = save_override; + ov_rogue_syms[idx] = save_override; else - ov_primary_syms[SYM_PET_OVERRIDE + SYM_OFF_X] = save_override; + ov_primary_syms[idx] = save_override; goto check_monsters; } break; - case SYM_PLAYER_OVERRIDE + SYM_OFF_X: + case SYM_HERO_OVERRIDE + SYM_OFF_X: sym = showsyms[S_HUMAN + SYM_OFF_M]; goto check_monsters; } @@ -1081,7 +1081,8 @@ struct permonst **for_supplement; } #if 0 /* 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) { *firstmatch = "boulder"; Sprintf(out_str, "%s%s", prefix, an(*firstmatch)); diff --git a/sys/unix/sysconf b/sys/unix/sysconf index 66df42c63..856d36b18 100644 --- a/sys/unix/sysconf +++ b/sys/unix/sysconf @@ -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 # NetHack may be freely redistributed. See license for details. # @@ -62,7 +62,7 @@ MAXPLAYERS=10 #SEDUCE=0 # 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. #ACCESSIBILITY=1 diff --git a/sys/winnt/sysconf.template b/sys/winnt/sysconf.template index 058b29122..7971031bb 100644 --- a/sys/winnt/sysconf.template +++ b/sys/winnt/sysconf.template @@ -53,7 +53,7 @@ WIZARDS=* #SEDUCE=0 # 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. #ACCESSIBILITY=1