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

show_glyph() impossible

Browse Source 
After glyph expansion a while back, a few 'if's had tests of
|  else if ((offset = (foo - bar)))
which should be
|  else if ((offset = (foo - bar)) >= 0)
Only used if show_glyph() has been passed invalid map coordinates
so never seen.
This commit is contained in:
PatR
2023-01-02 23:40:06 -08:00
parent c91f142bdb
commit 18fa85c681
1 changed files with 13 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
src/display.c
View File

@@ -1684,16 +1684,18 @@ show_glyph(coordxy x, coordxy y, int glyph)
* This assumes an ordering of the offsets. See display.h for
* the definition.
*/
if ((offset = (glyph - GLYPH_NOTHING_OFF)) >= 0) {
if (glyph < 0 || glyph >= MAX_GLYPH) {
/* invalid location and also invalid glyph */
text = "invalid";
} else if ((offset = (glyph - GLYPH_NOTHING_OFF)) >= 0) {
text = "nothing";
} else if ((offset = (glyph - GLYPH_UNEXPLORED_OFF)) >= 0) {
text = "unexplored";
} else if ((offset = (glyph - GLYPH_STATUE_FEM_PILETOP_OFF))) {
} else if ((offset = (glyph - GLYPH_STATUE_FEM_PILETOP_OFF)) >= 0) {
text = "statue of a female monster at top of a pile";
} else if ((offset = (glyph - GLYPH_STATUE_MALE_PILETOP_OFF))) {
} else if ((offset = (glyph - GLYPH_STATUE_MALE_PILETOP_OFF)) >= 0) {
text = "statue of a male monster at top of a pile";
} else if ((offset = (glyph - GLYPH_BODY_PILETOP_OFF))) {
} else if ((offset = (glyph - GLYPH_BODY_PILETOP_OFF)) >= 0) {
text = "body at top of a pile";
} else if ((offset = (glyph - GLYPH_OBJ_PILETOP_OFF))) {
text = "object at top of a pile";
@@ -1765,14 +1767,13 @@ show_glyph(coordxy x, coordxy y, int glyph)
} else if ((offset = (glyph - GLYPH_MON_MALE_OFF)) >= 0) {
text = "male monster";
}
impossible("show_glyph: bad pos %d %d with glyph %d [%s %d].", x, y,
glyph, text, offset);
impossible("show_glyph: bad pos <%d,%d> with glyph %d [%s %d].",
x, y, glyph, text, offset);
return;
}
if (glyph >= MAX_GLYPH) {
impossible("show_glyph: bad glyph %d [max %d] at (%d,%d).", glyph,
MAX_GLYPH, x, y);
} else if (glyph < 0 || glyph >= MAX_GLYPH) {
/* valid location but invalid glyph */
impossible("show_glyph: bad glyph %d [max %d] at <%d,%d>.",
glyph, MAX_GLYPH, x, y);
return;
}
#ifndef UNBUFFERED_GLYPHINFO