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_dgnit.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_dgnit.cc')
| -rw-r--r-- | crawl-ref/source/l_dgnit.cc | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/crawl-ref/source/l_dgnit.cc b/crawl-ref/source/l_dgnit.cc index 8827ee7630..cb42dc1c2a 100644 --- a/crawl-ref/source/l_dgnit.cc +++ b/crawl-ref/source/l_dgnit.cc @@ -25,7 +25,7 @@ static item_list _lua_get_ilist(lua_State *ls, int ndx) const char *spec = lua_tostring(ls, ndx); item_list ilist; - const std::string err = ilist.add_item(spec); + const string err = ilist.add_item(spec); if (!err.empty()) luaL_error(ls, err.c_str()); @@ -101,8 +101,8 @@ static int dgn_item_property_set(lua_State *ls) { if (item_def *item = clua_get_item(ls, 1)) { - const std::string key = luaL_checkstring(ls, 2); - const std::string type = luaL_checkstring(ls, 3); + const string key = luaL_checkstring(ls, 2); + const string type = luaL_checkstring(ls, 3); if (type.empty() || type.length() > 1) { luaL_error(ls, "Expected type: [BbSifsC], got: '%s'", @@ -145,8 +145,8 @@ static int dgn_item_property(lua_State *ls) { if (item_def *item = clua_get_item(ls, 1)) { - const std::string key = luaL_checkstring(ls, 2); - const std::string type = luaL_checkstring(ls, 3); + const string key = luaL_checkstring(ls, 2); + const string type = luaL_checkstring(ls, 3); if (type.empty() || type.length() > 1) { luaL_error(ls, "Expected type: [BbSifsC], got: '%s'", @@ -200,8 +200,8 @@ static int dgn_stash_items(lua_State *ls) unsigned min_value = lua_isnumber(ls, 1) ? luaL_checkint(ls, 1) : 0; bool skip_stackable = lua_isboolean(ls, 2) ? lua_toboolean(ls, 2) : false; - std::vector<const item_def*> floor_items; - std::vector<const item_def*> shop_items; + vector<const item_def*> floor_items; + vector<const item_def*> shop_items; for (ST_ItemIterator stii; stii; ++stii) { |