diff options
| author | Robert Vollmert <rvollmert@gmx.net> | 2009-11-15 21:53:24 +0100 |
|---|---|---|
| committer | Robert Vollmert <rvollmert@gmx.net> | 2009-11-15 23:11:42 +0100 |
| commit | fe2ab0f017464ff07a3d62e994861ea17260b260 (patch) | |
| tree | d6beb03f68e66873fac1cf7d35be3685b6d6a67d /crawl-ref | |
| parent | a189aa47ebeeee22eefcf0702568bf11b6c42339 (diff) | |
| download | crawl-ref-fe2ab0f017464ff07a3d62e994861ea17260b260.tar.gz crawl-ref-fe2ab0f017464ff07a3d62e994861ea17260b260.zip | |
Add get_feat_symbol.
Diffstat (limited to 'crawl-ref')
| -rw-r--r-- | crawl-ref/source/map_knowledge.cc | 8 | ||||
| -rw-r--r-- | crawl-ref/source/showsymb.cc | 5 | ||||
| -rw-r--r-- | crawl-ref/source/showsymb.h | 1 | ||||
| -rw-r--r-- | crawl-ref/source/tilepick.cc | 8 |
4 files changed, 8 insertions, 14 deletions
diff --git a/crawl-ref/source/map_knowledge.cc b/crawl-ref/source/map_knowledge.cc index f20e1edb00..54d49c763d 100644 --- a/crawl-ref/source/map_knowledge.cc +++ b/crawl-ref/source/map_knowledge.cc @@ -225,15 +225,9 @@ void clear_map(bool clear_detected_items, bool clear_detected_monsters) #ifdef USE_TILE if (is_terrain_mapped(p)) { - dungeon_feature_type feature = grd(p); - - unsigned int feat_symbol; - unsigned short feat_colour; - get_show_symbol(show_type(feature), &feat_symbol, &feat_colour); - unsigned int fg; unsigned int bg; - tileidx_unseen(fg, bg, feat_symbol, p); + tileidx_unseen(fg, bg, get_feat_symbol(grd(p)), p); env.tile_bk_bg(p) = bg; env.tile_bk_fg(p) = fg; } diff --git a/crawl-ref/source/showsymb.cc b/crawl-ref/source/showsymb.cc index 788f78660c..eb815c41e8 100644 --- a/crawl-ref/source/showsymb.cc +++ b/crawl-ref/source/showsymb.cc @@ -116,6 +116,11 @@ static int _get_mons_colour(const monsters *mons) return (col); } +unsigned get_feat_symbol(dungeon_feature_type feat) +{ + return (get_feature_def(feat).symbol); +} + unsigned get_item_symbol(show_item_type it) { return (get_feature_def(show_type(it)).symbol); diff --git a/crawl-ref/source/showsymb.h b/crawl-ref/source/showsymb.h index ea89d87a0f..c99198e69e 100644 --- a/crawl-ref/source/showsymb.h +++ b/crawl-ref/source/showsymb.h @@ -9,6 +9,7 @@ struct glyph unsigned short col; }; +unsigned get_feat_symbol(dungeon_feature_type feat); unsigned get_item_symbol(show_item_type it); glyph get_item_glyph(const item_def *item); glyph get_mons_glyph(const monsters *mons); diff --git a/crawl-ref/source/tilepick.cc b/crawl-ref/source/tilepick.cc index e7b8389051..4454eaf970 100644 --- a/crawl-ref/source/tilepick.cc +++ b/crawl-ref/source/tilepick.cc @@ -4678,15 +4678,9 @@ void tile_place_monster(int gx, int gy, int idx, bool foreground, bool detected) // features. if (is_terrain_mapped(gc)) { - dungeon_feature_type feature = grd(gc); - - unsigned int grid_symbol; - unsigned short grid_colour; - get_show_symbol(show_type(feature), &grid_symbol, &grid_colour); - unsigned int fg; unsigned int bg; - tileidx_unseen(fg, bg, grid_symbol, gc); + tileidx_unseen(fg, bg, get_feat_symbol(grd(gc)), gc); env.tile_bk_bg(gc) = bg; // env.tile_bk_bg(gc) = fg; } |