diff options
author | Robert Vollmert <rvollmert@gmx.net> | 2009-11-15 21:32:30 +0100 |
---|---|---|
committer | Robert Vollmert <rvollmert@gmx.net> | 2009-11-15 23:11:41 +0100 |
commit | d13f2354db0c50108beccd90aea26ec416e20d07 (patch) | |
tree | 7fea3408b5b3006419feff73035198bf8cc1e560 /crawl-ref/source/showsymb.cc | |
parent | ddf80f7077a00bd04168c904b153fb1e657b9d38 (diff) | |
download | crawl-ref-d13f2354db0c50108beccd90aea26ec416e20d07.tar.gz crawl-ref-d13f2354db0c50108beccd90aea26ec416e20d07.zip |
Convert get_mons_glyph to return a glyph struct.
Diffstat (limited to 'crawl-ref/source/showsymb.cc')
-rw-r--r-- | crawl-ref/source/showsymb.cc | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/crawl-ref/source/showsymb.cc b/crawl-ref/source/showsymb.cc index 6fbcb10ca9..55f3f51892 100644 --- a/crawl-ref/source/showsymb.cc +++ b/crawl-ref/source/showsymb.cc @@ -65,7 +65,7 @@ void get_show_symbol(show_type object, unsigned *ch, *colour = real_colour(*colour); } -int get_mons_colour(const monsters *mons) +static int _get_mons_colour(const monsters *mons) { int col = mons->colour; @@ -124,11 +124,12 @@ glyph get_item_glyph(const item_def *item) return (g); } -void get_mons_glyph(const monsters *mons, unsigned *glych, - unsigned short *glycol) +glyph get_mons_glyph(const monsters *mons) { - *glycol = get_mons_colour(mons); - get_symbol(coord_def(0,0), show_type(mons), glych, glycol); + glyph g; + g.ch = mons_char(mons->type); + g.col = _get_mons_colour(mons); + return (g); } unsigned get_screen_glyph( int x, int y ) |