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

symset S_darkroom, S_vibrating_sqaure

Browse Source 
Symbol set parsing rejected S_darkroom and S_vibrating_square.
Now it will accept them.

The fact that this bug wasn't noticed indicates that none of the
3.6.0 symbol sets (other than "Default symbols") is specifying a
value for either of these symbols.

This also changes the default vibrating square value from yellow
'^' (caret) to purple '~' (tilde).  I don't think there's any risk
of mistaking it for a long worm tail (brown '~') and it emphasizes
that it isn't really a trap.
This commit is contained in:
PatR
2016-04-06 16:52:06 -07:00
parent cb66774430
commit 3d50dbcbde
2 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
doc/fixes36.1
View File

@@ -198,6 +198,7 @@ when using the 'O' command for regexp options (autopickup exceptions,
commands invoked by uppercase meta characters: M-A, M-C, M-N, M-O, M-R, M-T
were missing from '? c' list of game commands (dat/hh)
tweak Baalzebub's lair and clean up the map display for it
symbol set definitions didn't recognize S_darkroom and S_vibrating_square
post-3.6.0: fix "object lost" panic during pickup caused by sortloot revamp
post-3.6.0: more sortloot revisions
@@ -278,6 +279,7 @@ wizard mode ^G can now specify "male" or "female" when creating a monster
REPRODUCIBLE_BUILD is new config.h setting to fetch build date+time from
environment instead of using current date+time, so that later rebuild
could duplicate the original (disabled by default; tested for Unix)
default value for vibrating square symbol changed from yellow '^' to purple '~'
Platform- and/or Interface-Specific New Features

6
src/drawing.c
View File

@@ -1,4 +1,4 @@
/* NetHack 3.6 drawing.c $NHDT-Date: 1447124657 2015/11/10 03:04:17 $ $NHDT-Branch: master $:$NHDT-Revision: 1.49 $ */
/* NetHack 3.6 drawing.c $NHDT-Date: 1459986719 2016/04/06 23:51:59 $ $NHDT-Branch: NetHack-3.6.0 $:$NHDT-Revision: 1.50 $ */
/* Copyright (c) NetHack Development Team 1992. */
/* NetHack may be freely redistributed. See license for details. */
@@ -202,7 +202,7 @@ const struct symdef defsyms[MAXPCHARS] = {
{ '^', "magic trap", C(HI_ZAP) }, /* trap */
{ '^', "anti-magic field", C(HI_ZAP) }, /* trap */
{ '^', "polymorph trap", C(CLR_BRIGHT_GREEN) }, /* trap */
{ '^', "vibrating square", C(CLR_YELLOW) }, /* trap */
{ '~', "vibrating square", C(CLR_MAGENTA) }, /* "trap" */
{ '|', "wall", C(CLR_GRAY) }, /* vbeam */
{ '-', "wall", C(CLR_GRAY) }, /* hbeam */
{ '\\', "wall", C(CLR_GRAY) }, /* lslant */
@@ -592,6 +592,7 @@ struct symparse loadsyms[] = {
{ SYM_PCHAR, S_bars, "S_bars" },
{ SYM_PCHAR, S_tree, "S_tree" },
{ SYM_PCHAR, S_room, "S_room" },
{ SYM_PCHAR, S_darkroom, "S_darkroom" },
{ SYM_PCHAR, S_corr, "S_corr" },
{ SYM_PCHAR, S_litcorr, "S_litcorr" },
{ SYM_PCHAR, S_upstair, "S_upstair" },
@@ -636,6 +637,7 @@ struct symparse loadsyms[] = {
{ SYM_PCHAR, S_magic_trap, "S_magic_trap" },
{ SYM_PCHAR, S_anti_magic_trap, "S_anti_magic_trap" },
{ SYM_PCHAR, S_polymorph_trap, "S_polymorph_trap" },
{ SYM_PCHAR, S_vibrating_square, "S_vibrating_square" },
{ SYM_PCHAR, S_vbeam, "S_vbeam" },
{ SYM_PCHAR, S_hbeam, "S_hbeam" },
{ SYM_PCHAR, S_lslant, "S_lslant" },