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_crawl.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_crawl.cc')
-rw-r--r-- | crawl-ref/source/l_crawl.cc | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/crawl-ref/source/l_crawl.cc b/crawl-ref/source/l_crawl.cc index 748fcbab20..fe7178aecc 100644 --- a/crawl-ref/source/l_crawl.cc +++ b/crawl-ref/source/l_crawl.cc @@ -446,7 +446,7 @@ static int crawl_bindkey(lua_State *ls) return 0; lua_pushvalue(ls, 2); - std::string name = clua.setuniqregistry(); + string name = clua.setuniqregistry(); if (lua_gettop(ls) != 2) { fprintf(stderr, "Stack top has changed!\n"); @@ -472,7 +472,7 @@ static int crawl_msgch_num(lua_State *ls) static int crawl_msgch_name(lua_State *ls) { int num = luaL_checkint(ls, 1); - std::string name = channel_to_str(num); + string name = channel_to_str(num); lua_pushstring(ls, name.c_str()); return 1; } @@ -578,7 +578,7 @@ static int crawl_trim(lua_State *ls) const char *s = luaL_checkstring(ls, 1); if (!s) return 0; - std::string text = s; + string text = s; trim_string(text); lua_pushstring(ls, text.c_str()); return 1; @@ -591,7 +591,7 @@ static int crawl_split(lua_State *ls) if (!s || !token) return 0; - std::vector<std::string> segs = split_string(token, s); + vector<string> segs = split_string(token, s); lua_newtable(ls); for (int i = 0, count = segs.size(); i < count; ++i) { @@ -671,7 +671,7 @@ static int crawl_get_command(lua_State *ls) const command_type cmd = name_to_command(luaL_checkstring(ls, 1)); - std::string cmd_name = command_to_string(cmd, true); + string cmd_name = command_to_string(cmd, true); if (strcmp(cmd_name.c_str(), "<") == 0) cmd_name = "<<"; @@ -745,7 +745,7 @@ static int crawl_err_trace(lua_State *ls) { // This code from lua.c:traceback() (mostly) const char *errs = lua_tostring(ls, 1); - std::string errstr = errs? errs : ""; + string errstr = errs? errs : ""; lua_getfield(ls, LUA_GLOBALSINDEX, "debug"); if (!lua_istable(ls, -1)) { @@ -960,7 +960,7 @@ LUAFN(_crawl_millis) } #endif -static std::string _crawl_make_name(lua_State *ls) +static string _crawl_make_name(lua_State *ls) { // A quick wrapper around itemname:make_name. Seed is random_int(). // Possible parameters: all caps, max length, char start. By default @@ -991,14 +991,14 @@ static int _crawl_god_speaks(lua_State *ls) const char *god_name = luaL_checkstring(ls, 1); if (!god_name) { - std::string err = "god_speaks requires a god!"; + string err = "god_speaks requires a god!"; return luaL_argerror(ls, 1, err.c_str()); } god_type god = str_to_god(god_name); if (god == GOD_NO_GOD) { - std::string err = make_stringf("'%s' matches no god.", god_name); + string err = make_stringf("'%s' matches no god.", god_name); return luaL_argerror(ls, 1, err.c_str()); } |