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

Make getpos for doors also target drawbridges

Browse Source
This commit is contained in:
Pasi Kallinen
2016-05-27 18:47:56 +03:00
parent 49da8b87d8
commit d51db5a992
3 changed files with 7 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
include/rm.h
View File

@@ -227,6 +227,10 @@
#define DARKROOMSYM (Is_rogue_level(&u.uz) ? S_stone : S_darkroom) #define DARKROOMSYM (Is_rogue_level(&u.uz) ? S_stone : S_darkroom)
#define is_cmap_trap(i) ((i) >= S_arrow_trap && (i) <= S_polymorph_trap)
#define is_cmap_drawbridge(i) ((i) >= S_vodbridge && (i) <= S_hcdbridge)
#define is_cmap_door(i) ((i) >= S_vodoor && (i) <= S_hcdoor)
struct symdef { struct symdef {
uchar sym; uchar sym;
const char *explanation; const char *explanation;

8
src/do_name.c
View File

@@ -137,11 +137,9 @@ int glyph, gloc;
&& glyph != objnum_to_glyph(BOULDER) && glyph != objnum_to_glyph(BOULDER)
&& glyph != objnum_to_glyph(ROCK)); && glyph != objnum_to_glyph(ROCK));
case GLOC_DOOR: return (glyph_is_cmap(glyph) case GLOC_DOOR: return (glyph_is_cmap(glyph)
&& ((glyph_to_cmap(glyph) == S_hcdoor) && (is_cmap_door(glyph_to_cmap(glyph))
|| (glyph_to_cmap(glyph) == S_vcdoor) || is_cmap_drawbridge(glyph_to_cmap(glyph))
|| (glyph_to_cmap(glyph) == S_hodoor) || glyph_to_cmap(glyph) == S_ndoor));
|| (glyph_to_cmap(glyph) == S_vodoor)
|| (glyph_to_cmap(glyph) == S_ndoor)));
} }
} }

3
src/pager.c
View File

@@ -775,9 +775,6 @@ const char **firstmatch;
} }
} }
#define is_cmap_trap(i) ((i) >= S_arrow_trap && (i) <= S_polymorph_trap)
#define is_cmap_drawbridge(i) ((i) >= S_vodbridge && (i) <= S_hcdbridge)
/* Now check for graphics symbols */ /* Now check for graphics symbols */
alt_i = (sym == (looked ? showsyms[0] : defsyms[0].sym)) ? 0 : (2 + 1); alt_i = (sym == (looked ? showsyms[0] : defsyms[0].sym)) ? 0 : (2 + 1);
for (hit_trap = FALSE, i = 0; i < MAXPCHARS; i++) { for (hit_trap = FALSE, i = 0; i < MAXPCHARS; i++) {