diff options
| author | Raphael Langella <raphael.langella@gmail.com> | 2012-08-26 22:50:06 +0200 |
|---|---|---|
| committer | Raphael Langella <raphael.langella@gmail.com> | 2012-08-26 23:06:30 +0200 |
| commit | 770bcbd1844b97b671d0e47ea8313cdf2c74c5ea (patch) | |
| tree | e030cf61afce9ca69b74bb38eb73734bf10f633e /crawl-ref/source/showsymb.cc | |
| parent | a6c16c7f2066c854a01f25e9e6c3d8e44282a638 (diff) | |
| download | crawl-ref-770bcbd1844b97b671d0e47ea8313cdf2c74c5ea.tar.gz crawl-ref-770bcbd1844b97b671d0e47ea8313cdf2c74c5ea.zip | |
Use std namespace.
I had to rename distance() (in coord.h) to distance2() because it conflicts
with the STL function to compare 2 iterators. Not a bad change given how it
returns the square of the distance anyway.
I also had to rename the message global variable (in message.cc) to buffer.
I tried to fix and improve the coding style has much as I could, but I
probably missed a few given how huge and tedious it is.
I also didn't touch crawl-gdb.py, and the stuff in prebuilt, rltiles/tool
and util/levcomp.*, because I have no clue about those.
Diffstat (limited to 'crawl-ref/source/showsymb.cc')
| -rw-r--r-- | crawl-ref/source/showsymb.cc | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/crawl-ref/source/showsymb.cc b/crawl-ref/source/showsymb.cc index e8b177bcf3..9a10761cb8 100644 --- a/crawl-ref/source/showsymb.cc +++ b/crawl-ref/source/showsymb.cc @@ -445,10 +445,10 @@ glyph get_mons_glyph(const monster_info& mi) return g; } -std::string glyph_to_tagstr(const glyph& g) +string glyph_to_tagstr(const glyph& g) { - std::string col = colour_to_str(g.col); - std::string ch = stringize_glyph(g.ch); + string col = colour_to_str(g.col); + string ch = stringize_glyph(g.ch); if (g.ch == '<') ch += "<"; return make_stringf("<%s>%s</%s>", col.c_str(), ch.c_str(), col.c_str()); |