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

fix an expanded-glyphs regression

Browse Source 
Restore behavior that was unintentionally overlooked during
the expansion of glyphs earlier this year.
This commit is contained in:
nhmall
2021-10-09 11:34:37 -04:00
parent 51b8ded681
commit 6eecfbc28b
2 changed files with 12 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
doc/fixes37.0
View File

@@ -837,6 +837,8 @@ an item thrown or dropped while swallowed was treated as being picked up by an
segfault if gremlin fled weaponless hero wearing gold dragon scales/mail
'disambiguate WHACK' patch affected field layout of objects[] but EDITLEVEL
wasn't incremented, allowing incompatable save files to be restored
restore the boulder exception for piletops that had been unintentionally
removed during the expanded-glyphs changes
curses: 'msg_window' option wasn't functional for curses unless the binary
also included tty support

12
include/display.h
View File

@@ -888,9 +888,17 @@ enum glyph_offsets {
((int) ((obj)->corpsenm + (obj_is_piletop(obj) \
? GLYPH_BODY_PILETOP_OFF \
: GLYPH_BODY_OFF)))
/* Paraphrased rationale from the original commit for the boulder
exception: If a boulder is the topmost item on a pile, then it is
not mapped to a piletop glyph; mainly because boulders are "solid";
boulders dropped by monsters are nearly always over other objects;
also done so that special levels such a Sokoban can "hide" items
under the boulders. */
#define normal_obj_to_glyph(obj) \
((int) ((obj)->otyp + (obj_is_piletop(obj) \
? GLYPH_OBJ_PILETOP_OFF \
((int) ((obj)->otyp + \
((obj_is_piletop(obj) && ((obj)->otyp != BOULDER)) \
? GLYPH_OBJ_PILETOP_OFF \
: GLYPH_OBJ_OFF)))
/* MRKR: Statues now have glyphs corresponding to the monster they */