summaryrefslogtreecommitdiffstats
path: root/crawl-ref/source/l_travel.cc
diff options
context:
space:
mode:
authorRaphael Langella <raphael.langella@gmail.com>2012-08-26 22:50:06 +0200
committerRaphael Langella <raphael.langella@gmail.com>2012-08-26 23:06:30 +0200
commit770bcbd1844b97b671d0e47ea8313cdf2c74c5ea (patch)
treee030cf61afce9ca69b74bb38eb73734bf10f633e /crawl-ref/source/l_travel.cc
parenta6c16c7f2066c854a01f25e9e6c3d8e44282a638 (diff)
downloadcrawl-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_travel.cc')
-rw-r--r--crawl-ref/source/l_travel.cc4
1 files changed, 2 insertions, 2 deletions
diff --git a/crawl-ref/source/l_travel.cc b/crawl-ref/source/l_travel.cc
index b6c0d2c271..637948eb07 100644
--- a/crawl-ref/source/l_travel.cc
+++ b/crawl-ref/source/l_travel.cc
@@ -44,14 +44,14 @@ LUAFN(l_del_exclude)
LUAFN(l_feature_is_traversable)
{
- const std::string &name = luaL_checkstring(ls, 1);
+ const string &name = luaL_checkstring(ls, 1);
const dungeon_feature_type feat = dungeon_feature_by_name(name);
PLUARET(boolean, feat_is_traversable_now(feat));
}
LUAFN(l_find_deepest_explored)
{
- const std::string &branch = luaL_checkstring(ls, 1);
+ const string &branch = luaL_checkstring(ls, 1);
const level_id lid(str_to_branch(branch), 1);
if (lid.branch == NUM_BRANCHES)
luaL_error(ls, "Bad branch name: '%s'", branch.c_str());