From 82089b877c1abe027536b43b87170b7a010f32b3 Mon Sep 17 00:00:00 2001 From: Robert Vollmert Date: Sun, 8 Nov 2009 21:47:09 +0100 Subject: Remove unneeded colour argument from a variant of get_symbol. --- crawl-ref/source/map_knowledge.cc | 2 +- crawl-ref/source/showsymb.cc | 3 +-- crawl-ref/source/showsymb.h | 3 +-- 3 files changed, 3 insertions(+), 5 deletions(-) (limited to 'crawl-ref') diff --git a/crawl-ref/source/map_knowledge.cc b/crawl-ref/source/map_knowledge.cc index 0e04f7046c..5f42c0165a 100644 --- a/crawl-ref/source/map_knowledge.cc +++ b/crawl-ref/source/map_knowledge.cc @@ -27,7 +27,7 @@ unsigned map_cell::glyph() const { if (!object) return (' '); - return get_symbol(object, NULL, !(flags & MAP_SEEN_FLAG)); + return get_symbol(object, !(flags & MAP_SEEN_FLAG)); } bool map_cell::known() const diff --git a/crawl-ref/source/showsymb.cc b/crawl-ref/source/showsymb.cc index 2533981f93..36a6ab34fa 100644 --- a/crawl-ref/source/showsymb.cc +++ b/crawl-ref/source/showsymb.cc @@ -164,8 +164,7 @@ void get_symbol(const coord_def& where, *colour = real_colour(*colour); } -unsigned get_symbol(show_type object, unsigned short *colour, - bool magic_mapped) +unsigned get_symbol(show_type object, bool magic_mapped) { unsigned ch; get_symbol(coord_def(0,0), object, &ch, NULL, magic_mapped); diff --git a/crawl-ref/source/showsymb.h b/crawl-ref/source/showsymb.h index d74016bcd3..0a8640d5d9 100644 --- a/crawl-ref/source/showsymb.h +++ b/crawl-ref/source/showsymb.h @@ -13,8 +13,7 @@ unsigned get_screen_glyph( const coord_def &p ); int get_mons_colour(const monsters *mons); unsigned grid_character_at(const coord_def &c); -unsigned get_symbol(show_type object, unsigned short *colour = NULL, - bool magic_mapped = false); +unsigned get_symbol(show_type object, bool magic_mapped = false); void get_symbol(const coord_def& where, show_type object, unsigned *ch, unsigned short *colour, -- cgit v1.2.3-54-g00ecf