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/l_colour.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/l_colour.cc')
| -rw-r--r-- | crawl-ref/source/l_colour.cc | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/crawl-ref/source/l_colour.cc b/crawl-ref/source/l_colour.cc index 08b12abb27..3f97a55339 100644 --- a/crawl-ref/source/l_colour.cc +++ b/crawl-ref/source/l_colour.cc @@ -22,7 +22,7 @@ static int _lua_element_colour(int rand, const coord_def& loc, struct lua_element_colour_calc : public element_colour_calc { - lua_element_colour_calc(element_type _type, std::string _name, + lua_element_colour_calc(element_type _type, string _name, lua_datum _function) : element_colour_calc(_type, _name, (element_colour_calculator)_lua_element_colour), function(_function) @@ -62,7 +62,7 @@ static int _lua_element_colour(int rand, const coord_def& loc, return BLACK; } - std::string colour = luaL_checkstring(ls, -1); + string colour = luaL_checkstring(ls, -1); lua_pop(ls, 1); return str_to_colour(colour); @@ -75,7 +75,7 @@ function add_colour(name, fun) */ LUAFN(l_add_colour) { - const std::string &name = luaL_checkstring(ls, 1); + const string &name = luaL_checkstring(ls, 1); if (lua_gettop(ls) != 2 || !lua_isfunction(ls, 2)) luaL_error(ls, "Expected colour generation function."); |