diff options
author | Loïc Blot <nerzhul@users.noreply.github.com> | 2017-08-20 13:30:50 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2017-08-20 13:30:50 +0200 |
commit | 1c1c97cbd1d7913ac12bf550ec02c97f843a0fd3 (patch) | |
tree | 03dd0c39e323c7f0b1f06014ff30e74f429bfa01 /src/script/lua_api/l_mapgen.cpp | |
parent | 50669cd2822a11570ae462972194eeb2d585a8c1 (diff) | |
download | minetest-1c1c97cbd1d7913ac12bf550ec02c97f843a0fd3.tar.gz minetest-1c1c97cbd1d7913ac12bf550ec02c97f843a0fd3.tar.bz2 minetest-1c1c97cbd1d7913ac12bf550ec02c97f843a0fd3.zip |
Modernize source code: last part (#6285)
* Modernize source code: last par
* Use empty when needed
* Use emplace_back instead of push_back when needed
* For range-based loops
* Initializers fixes
* constructors, destructors default
* c++ C stl includes
Diffstat (limited to 'src/script/lua_api/l_mapgen.cpp')
-rw-r--r-- | src/script/lua_api/l_mapgen.cpp | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/src/script/lua_api/l_mapgen.cpp b/src/script/lua_api/l_mapgen.cpp index 454e8f719..a5e122ddb 100644 --- a/src/script/lua_api/l_mapgen.cpp +++ b/src/script/lua_api/l_mapgen.cpp @@ -847,9 +847,8 @@ int ModApiMapgen::l_get_gen_notify(lua_State *L) lua_newtable(L); int i = 1; - for (std::set<u32>::iterator it = emerge->gen_notify_on_deco_ids.begin(); - it != emerge->gen_notify_on_deco_ids.end(); ++it) { - lua_pushnumber(L, *it); + for (u32 gen_notify_on_deco_id : emerge->gen_notify_on_deco_ids) { + lua_pushnumber(L, gen_notify_on_deco_id); lua_rawseti(L, -2, i); i++; } @@ -1322,7 +1321,7 @@ int ModApiMapgen::l_create_schematic(lua_State *L) lua_pop(L, 1); u8 prob = getintfield_default(L, -1, "prob", MTSCHEM_PROB_ALWAYS); - prob_list.push_back(std::make_pair(pos, prob)); + prob_list.emplace_back(pos, prob); } lua_pop(L, 1); @@ -1336,7 +1335,7 @@ int ModApiMapgen::l_create_schematic(lua_State *L) if (lua_istable(L, -1)) { s16 ypos = getintfield_default(L, -1, "ypos", 0); u8 prob = getintfield_default(L, -1, "prob", MTSCHEM_PROB_ALWAYS); - slice_prob_list.push_back(std::make_pair(ypos, prob)); + slice_prob_list.emplace_back(ypos, prob); } lua_pop(L, 1); |