From 4bddff39d6767838f019f79d069591020223389c Mon Sep 17 00:00:00 2001 From: j-p-e-g Date: Tue, 28 Jul 2009 14:05:26 +0000 Subject: * Another magic mapping fix in cooperation with zebez. Thanks! :) * Don't make Detect creatures "detect" monsters you can currently see. * Replace rock stair tiles with Eino's escape hatch tiles. * Update change log once again. git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/branches/stone_soup-0.5@10447 c06c8d41-db1a-0410-9941-cceddc491573 --- crawl-ref/source/tilepick.cc | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) (limited to 'crawl-ref/source/tilepick.cc') diff --git a/crawl-ref/source/tilepick.cc b/crawl-ref/source/tilepick.cc index e9f17e482b..243e4afcbd 100644 --- a/crawl-ref/source/tilepick.cc +++ b/crawl-ref/source/tilepick.cc @@ -2406,13 +2406,13 @@ int tileidx_feature(int object, int gx, int gy) case DNGN_STONE_STAIRS_DOWN_III: return TILE_DNGN_STONE_STAIRS_DOWN; case DNGN_ESCAPE_HATCH_DOWN: - return TILE_DNGN_ROCK_STAIRS_DOWN; + return TILE_DNGN_ESCAPE_HATCH_DOWN; case DNGN_STONE_STAIRS_UP_I: case DNGN_STONE_STAIRS_UP_II: case DNGN_STONE_STAIRS_UP_III: return TILE_DNGN_STONE_STAIRS_UP; case DNGN_ESCAPE_HATCH_UP: - return TILE_DNGN_ROCK_STAIRS_UP; + return TILE_DNGN_ESCAPE_HATCH_UP; case DNGN_ENTER_DIS: return TILE_DNGN_ENTER_DIS; case DNGN_ENTER_GEHENNA: @@ -4483,19 +4483,20 @@ void tile_place_monster(int gx, int gy, int idx, bool foreground, bool detected) else { // Retain the magic mapped terrain, but don't give away the real - // features either. + // features. if (is_terrain_mapped(gc)) { unsigned int feature = grd(gc); unsigned int grid_symbol; - unsigned short grid_color; - get_item_symbol(feature, &grid_symbol, &grid_color); + unsigned short grid_colour; + get_item_symbol(feature, &grid_symbol, &grid_colour); unsigned int fg; unsigned int bg; tileidx_unseen(fg, bg, grid_symbol, gc); env.tile_bk_bg(gc) = bg; +// env.tile_bk_bg(gc) = fg; } env.tile_bk_fg(gc) = t0; } -- cgit v1.2.3-54-g00ecf