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

update master's version of display.c

Browse Source 
Incorporate a few pieces of in-progress code into master
so that it isn't left in an odd state, thus prompting
patches.
This commit is contained in:
nhmall
2015-06-16 06:23:28 -04:00
parent c289784d49
commit b33c3381e6
2 changed files with 49 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
include/flag.h
View File

@@ -1,4 +1,4 @@
/* NetHack 3.6 flag.h $NHDT-Date: 1433983706 2015/06/11 00:48:26 $ $NHDT-Branch: master $:$NHDT-Revision: 1.86 $ */ /* NetHack 3.6 flag.h $NHDT-Date: 1434450203 2015/06/16 10:23:23 $ $NHDT-Branch: master $:$NHDT-Revision: 1.87 $ */
/* Copyright (c) Stichting Mathematisch Centrum, Amsterdam, 1985. */ /* Copyright (c) Stichting Mathematisch Centrum, Amsterdam, 1985. */
/* NetHack may be freely redistributed. See license for details. */ /* NetHack may be freely redistributed. See license for details. */
@@ -207,8 +207,9 @@ struct instance_flags {
boolean rlecomp; /* run-length comp of levels when writing savefile */ boolean rlecomp; /* run-length comp of levels when writing savefile */
uchar num_pad_mode; uchar num_pad_mode;
boolean echo; /* 1 to echo characters */ boolean echo; /* 1 to echo characters */
boolean use_menu_color; /* use color in menus; only if wc_color */ boolean use_menu_color; /* use color in menus; only if wc_color */
boolean use_status_hilites; /* use color in status */ boolean use_status_hilites; /* use color in status line */
boolean use_background_glyph; /* use background glyph when appropriate */
#if 0 #if 0
boolean DECgraphics; /* use DEC VT-xxx extended character set */ boolean DECgraphics; /* use DEC VT-xxx extended character set */
boolean IBMgraphics; /* use IBM extended character set */ boolean IBMgraphics; /* use IBM extended character set */

54
src/display.c
View File

@@ -1,4 +1,4 @@
/* NetHack 3.6 display.c $NHDT-Date: 1434447701 2015/06/16 09:41:41 $ $NHDT-Branch: master $:$NHDT-Revision: 1.63 $ */ /* NetHack 3.6 display.c $NHDT-Date: 1434450195 2015/06/16 10:23:15 $ $NHDT-Branch: master $:$NHDT-Revision: 1.64 $ */
/* Copyright (c) Dean Luick, with acknowledgements to Kevin Darcy */ /* Copyright (c) Dean Luick, with acknowledgements to Kevin Darcy */
/* and Dave Cohrs, 1990. */ /* and Dave Cohrs, 1990. */
/* NetHack may be freely redistributed. See license for details. */ /* NetHack may be freely redistributed. See license for details. */
@@ -1373,7 +1373,7 @@ int x, y, glyph;
return; return;
} }
if (gbuf[y][x].glyph != glyph) { if (gbuf[y][x].glyph != glyph || iflags.use_background_glyph) {
gbuf[y][x].glyph = glyph; gbuf[y][x].glyph = glyph;
gbuf[y][x].new = 1; gbuf[y][x].new = 1;
if (gbuf_start[y] > x) if (gbuf_start[y] > x)
@@ -1707,15 +1707,51 @@ STATIC_OVL int
get_bk_glyph(x,y) get_bk_glyph(x,y)
xchar x, y; xchar x, y;
{ {
#if 1 int idx, bkglyph = NO_GLYPH;
int retglyph = NO_GLYPH;
nhUse(x);
nhUse(y);
#else
struct rm *lev = &levl[x][y]; struct rm *lev = &levl[x][y];
#endif
return retglyph; if (iflags.use_background_glyph) {
switch (lev->typ) {
case SCORR:
case STONE:
idx = level.flags.arboreal ? S_tree : S_stone;
break;
case ROOM:
idx = S_room;
break;
case CORR:
idx = (lev->waslit || flags.lit_corridor) ? S_litcorr : S_corr;
break;
case ICE:
idx = S_ice;
break;
case AIR:
idx = S_air;
break;
case CLOUD:
idx = S_cloud;
break;
case WATER:
idx = S_water;
break;
default:
idx = S_room;
break;
}
if (!cansee(x, y) && (!lev->waslit || flags.dark_room)) {
/* Floor spaces are dark if unlit. Corridors are dark if unlit. */
if (lev->typ == CORR && idx == S_litcorr)
idx = S_corr;
else if (idx == S_room)
idx = (flags.dark_room && iflags.use_color) ?
(DARKROOMSYM) : S_stone;
}
if (idx != S_room)
bkglyph = cmap_to_glyph(idx);
}
return bkglyph;
} }
/* ------------------------------------------------------------------------- /* -------------------------------------------------------------------------