summaryrefslogtreecommitdiffstats
path: root/crawl-ref
diff options
context:
space:
mode:
authorRobert Vollmert <rvollmert@gmx.net>2009-11-08 21:47:09 +0100
committerRobert Vollmert <rvollmert@gmx.net>2009-11-08 21:47:09 +0100
commit82089b877c1abe027536b43b87170b7a010f32b3 (patch)
treefffeff4db3355e3de3edede491de73b7d42a6878 /crawl-ref
parent8b6f27f55180f53299763be45ad42a5a13ba6e07 (diff)
downloadcrawl-ref-82089b877c1abe027536b43b87170b7a010f32b3.tar.gz
crawl-ref-82089b877c1abe027536b43b87170b7a010f32b3.zip
Remove unneeded colour argument from a variant of get_symbol.
Diffstat (limited to 'crawl-ref')
-rw-r--r--crawl-ref/source/map_knowledge.cc2
-rw-r--r--crawl-ref/source/showsymb.cc3
-rw-r--r--crawl-ref/source/showsymb.h3
3 files changed, 3 insertions, 5 deletions
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,