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_dgntil.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_dgntil.cc')
| -rw-r--r-- | crawl-ref/source/l_dgntil.cc | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/crawl-ref/source/l_dgntil.cc b/crawl-ref/source/l_dgntil.cc index 5be03bd5f6..b4dd25b4e5 100644 --- a/crawl-ref/source/l_dgntil.cc +++ b/crawl-ref/source/l_dgntil.cc @@ -31,7 +31,7 @@ tileidx_t get_tile_idx(lua_State *ls, int arg) tileidx_t idx; if (!tile_dngn_index(tile_name, &idx)) { - std::string error = "Couldn't find tile '"; + string error = "Couldn't find tile '"; error += tile_name; error += "'"; luaL_argerror(ls, arg, error.c_str()); @@ -81,12 +81,12 @@ LUAFN(dgn_lfloortile) LUAFN(dgn_change_rock_tile) { - std::string tilename = luaL_checkstring(ls, 1); + string tilename = luaL_checkstring(ls, 1); tileidx_t rock; if (!tile_dngn_index(tilename.c_str(), &rock)) { - std::string error = "Couldn't find tile '"; + string error = "Couldn't find tile '"; error += tilename; error += "'"; luaL_argerror(ls, 1, error.c_str()); @@ -101,12 +101,12 @@ LUAFN(dgn_change_rock_tile) LUAFN(dgn_change_floor_tile) { - std::string tilename = luaL_checkstring(ls, 1); + string tilename = luaL_checkstring(ls, 1); tileidx_t floor; if (!tile_dngn_index(tilename.c_str(), &floor)) { - std::string error = "Couldn't find tile '"; + string error = "Couldn't find tile '"; error += tilename; error += "'"; luaL_argerror(ls, 1, error.c_str()); @@ -145,12 +145,12 @@ LUAFN(dgn_tile_feat_changed) return 0; } - std::string tilename = luaL_checkstring(ls, 3); + string tilename = luaL_checkstring(ls, 3); tileidx_t feat; if (!tile_dngn_index(tilename.c_str(), &feat)) { - std::string error = "Couldn't find tile '"; + string error = "Couldn't find tile '"; error += tilename; error += "'"; luaL_argerror(ls, 1, error.c_str()); @@ -174,12 +174,12 @@ LUAFN(dgn_tile_floor_changed) return 0; } - std::string tilename = luaL_checkstring(ls, 3); + string tilename = luaL_checkstring(ls, 3); tileidx_t floor; if (!tile_dngn_index(tilename.c_str(), &floor)) { - std::string error = "Couldn't find tile '"; + string error = "Couldn't find tile '"; error += tilename; error += "'"; luaL_argerror(ls, 1, error.c_str()); |