some bk_glyph code iflags.use_background_glyph only

This commit is contained in:
nhmall
2015-06-12 07:10:46 -04:00
parent 017e826837
commit 23cbe049be
+40 -39
View File
@@ -1710,46 +1710,47 @@ xchar x, y;
int idx, bkglyph = NO_GLYPH; int idx, bkglyph = NO_GLYPH;
struct rm *lev = &levl[x][y]; struct rm *lev = &levl[x][y];
switch (lev->typ) { if (iflags.use_background_glyph) {
case SCORR: switch (lev->typ) {
case STONE: case SCORR:
idx = level.flags.arboreal ? S_tree : S_stone; case STONE:
break; idx = level.flags.arboreal ? S_tree : S_stone;
case ROOM: break;
idx = S_room; case ROOM:
break; idx = S_room;
case CORR: break;
idx = (lev->waslit || flags.lit_corridor) ? S_litcorr : S_corr; case CORR:
break; idx = (lev->waslit || flags.lit_corridor) ? S_litcorr : S_corr;
case ICE: break;
idx = S_ice; case ICE:
break; idx = S_ice;
case AIR: break;
idx = S_air; case AIR:
break; idx = S_air;
case CLOUD: break;
idx = S_cloud; case CLOUD:
break; idx = S_cloud;
case WATER: break;
idx = S_water; case WATER:
break; idx = S_water;
default: break;
idx = S_room; default:
break; 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);
} }
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; return bkglyph;
} }