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

X11 - ice on black&white text map

Browse Source 
Add support for black&white ice (3.7.0 feature) similar to already
supported black&white lava:  show in inverse video if it uses the
same character as floor (in the ice case; as water in the lava case).

Inverse for monster detection, black&white lava, and now black&white
ice was being done unconditionally but has been changed so that the
user can disable it by toggling the 'use_inverse' run-time option.

[Bug noticed in the process:  if you move an inverse video cursor
onto inverse video detected monster/lava/ice (when doing farlook, for
instance), the cursor disappears.  I'm not sure how to address that.]
This commit is contained in:
PatR
2020-04-06 14:15:36 -07:00
parent 4d8d88063b
commit d984b0b87c
3 changed files with 7 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
doc/fixes37.0
View File

@@ -161,6 +161,8 @@ fix door created into random wall or position opening into solid wall
being more general; change its default to True being more general; change its default to True
X11: was still initializing map to 'stone' instead of 'unexplored' after they X11: was still initializing map to 'stone' instead of 'unexplored' after they
became separate glyphs became separate glyphs
X11: for text map without color, add support for black&white ice; draw it in
inverse video to distinguish from ordinary floor
Platform- and/or Interface-Specific Fixes Platform- and/or Interface-Specific Fixes

2
win/X11/winX.c
View File

@@ -98,7 +98,7 @@ static XtSignalId X11_sig_id;
/* Interface definition, for windows.c */ /* Interface definition, for windows.c */
struct window_procs X11_procs = { struct window_procs X11_procs = {
"X11", "X11",
( WC_COLOR | WC_HILITE_PET | WC_ASCII_MAP | WC_TILED_MAP ( WC_COLOR | WC_INVERSE | WC_HILITE_PET | WC_ASCII_MAP | WC_TILED_MAP
| WC_PLAYER_SELECTION | WC_PERM_INVENT | WC_MOUSE_SUPPORT ), | WC_PLAYER_SELECTION | WC_PERM_INVENT | WC_MOUSE_SUPPORT ),
/* status requires VIA_WINDOWPORT(); WC2_FLUSH_STATUS ensures that */ /* status requires VIA_WINDOWPORT(); WC2_FLUSH_STATUS ensures that */
( WC2_FLUSH_STATUS ( WC2_FLUSH_STATUS

7
win/X11/winmap.c
View File

@@ -129,7 +129,8 @@ int bkglyph UNUSED;
co_ptr = &map_info->text_map.colors[y][x]; co_ptr = &map_info->text_map.colors[y][x];
colordif = (((special & MG_PET) != 0 && iflags.hilite_pet) colordif = (((special & MG_PET) != 0 && iflags.hilite_pet)
|| ((special & MG_OBJPILE) != 0 && iflags.hilite_pile) || ((special & MG_OBJPILE) != 0 && iflags.hilite_pile)
|| ((special & (MG_DETECT | MG_BW_LAVA)) != 0)) || ((special & (MG_DETECT | MG_BW_LAVA | MG_BW_ICE)) != 0
&& iflags.use_inverse))
? CLR_MAX : 0; ? CLR_MAX : 0;
if (*co_ptr != (uchar) (color + colordif)) { if (*co_ptr != (uchar) (color + colordif)) {
*co_ptr = (uchar) (color + colordif); *co_ptr = (uchar) (color + colordif);
@@ -141,9 +142,9 @@ int bkglyph UNUSED;
if (update_bbox) { /* update row bbox */ if (update_bbox) { /* update row bbox */
if ((uchar) x < map_info->t_start[y]) if ((uchar) x < map_info->t_start[y])
map_info->t_start[y] = x; map_info->t_start[y] = (uchar) x;
if ((uchar) x > map_info->t_stop[y]) if ((uchar) x > map_info->t_stop[y])
map_info->t_stop[y] = x; map_info->t_stop[y] = (uchar) x;
} }
} }