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/colour.h | |
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/colour.h')
-rw-r--r-- | crawl-ref/source/colour.h | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/crawl-ref/source/colour.h b/crawl-ref/source/colour.h index 06c4aed9ab..3f47221ea8 100644 --- a/crawl-ref/source/colour.h +++ b/crawl-ref/source/colour.h @@ -64,9 +64,9 @@ typedef int (*element_colour_calculator)(int, const coord_def&); struct element_colour_calc { element_type type; - std::string name; + string name; - element_colour_calc(element_type _type, std::string _name, + element_colour_calc(element_type _type, string _name, element_colour_calculator _calc) : type(_type), name(_name), calc(_calc) {}; @@ -82,10 +82,10 @@ protected: element_colour_calculator calc; }; -int str_to_colour(const std::string &str, int default_colour = -1, +int str_to_colour(const string &str, int default_colour = -1, bool accept_number = true); -const std::string colour_to_str(colour_t colour); -unsigned int str_to_tile_colour(std::string colour); +const string colour_to_str(colour_t colour); +unsigned int str_to_tile_colour(string colour); void init_element_colours(); void add_element_colour(element_colour_calc *colour); |