From d13f2354db0c50108beccd90aea26ec416e20d07 Mon Sep 17 00:00:00 2001
From: Robert Vollmert <rvollmert@gmx.net>
Date: Sun, 15 Nov 2009 21:32:30 +0100
Subject: Convert get_mons_glyph to return a glyph struct.

---
 crawl-ref/source/tutorial.cc | 11 ++---------
 1 file changed, 2 insertions(+), 9 deletions(-)

(limited to 'crawl-ref/source/tutorial.cc')

diff --git a/crawl-ref/source/tutorial.cc b/crawl-ref/source/tutorial.cc
index 6bf0ed1231..5d9edbebfa 100644
--- a/crawl-ref/source/tutorial.cc
+++ b/crawl-ref/source/tutorial.cc
@@ -1338,11 +1338,7 @@ void tutorial_first_monster(const monsters &mon)
             "by hovering your mouse over its tile, and read the monster "
             "description by clicking on it with your <w>right mouse button</w>."
 #else
-    unsigned ch;
-    unsigned short col;
-    get_mons_glyph(&mon, &ch, &col);
-
-    text += _colourize_glyph(col, ch);
+    text += _colourize_glyph(get_mons_glyph(&mon));
     text += " is a monster, usually depicted by a letter. Some typical "
             "early monsters look like <brown>r</brown>, <green>l</green>, "
             "<brown>K</brown> or <lightgrey>g</lightgrey>. ";
@@ -3234,10 +3230,7 @@ void learned_something_new(tutorial_event_type seen_what, coord_def gc)
 
         text << "is a ";
 #else
-        unsigned short col;
-        get_mons_glyph(m, &ch, &col);
-
-        text << _colourize_glyph(col, ch) << " is a ";
+        text << _colourize_glyph(get_mons_glyph(m)) << " is a ";
 #endif
         text << m->name(DESC_PLAIN).c_str() << ". ";
 
-- 
cgit v1.2.3-54-g00ecf