BRNSystems/minetest
1
0
Fork 0
forked from Mirrorlandia_minetest/minetest
Code Pull Requests 1 Activity

Add return list of individual counts to find_node_in_area

Browse Source
This commit is contained in:
TeTpaAka 2015-05-30 20:53:21 +02:00 committed by est31
parent 502e40a649
commit e50aa4ed06
2 changed files with 20 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
doc/lua_api.txt
View File

@ -1917,6 +1917,7 @@ and `minetest.auth_reload` call the authetification handler.
* `minetest.find_node_near(pos, radius, nodenames)`: returns pos or `nil` * `minetest.find_node_near(pos, radius, nodenames)`: returns pos or `nil`
* `nodenames`: e.g. `{"ignore", "group:tree"}` or `"default:dirt"` * `nodenames`: e.g. `{"ignore", "group:tree"}` or `"default:dirt"`
* `minetest.find_nodes_in_area(minp, maxp, nodenames)`: returns a list of positions * `minetest.find_nodes_in_area(minp, maxp, nodenames)`: returns a list of positions
* returns as second value a table with the count of the individual nodes found
* `nodenames`: e.g. `{"ignore", "group:tree"}` or `"default:dirt"` * `nodenames`: e.g. `{"ignore", "group:tree"}` or `"default:dirt"`
* `minetest.find_nodes_in_area_under_air(minp, maxp, nodenames)`: returns a list of positions * `minetest.find_nodes_in_area_under_air(minp, maxp, nodenames)`: returns a list of positions
* returned positions are nodes with a node air above * returned positions are nodes with a node air above

29
src/script/lua_api/l_env.cpp
View File

@ -572,19 +572,28 @@ int ModApiEnvMod::l_find_nodes_in_area(lua_State *L)
ndef->getIds(lua_tostring(L, 3), filter); ndef->getIds(lua_tostring(L, 3), filter);
} }
std::map<content_t, u16> individual_count;
lua_newtable(L); lua_newtable(L);
u64 i = 0; u64 i = 0;
for(s16 x = minp.X; x <= maxp.X; x++) for (s16 x = minp.X; x <= maxp.X; x++)
for(s16 y = minp.Y; y <= maxp.Y; y++) for (s16 y = minp.Y; y <= maxp.Y; y++)
for(s16 z = minp.Z; z <= maxp.Z; z++) { for (s16 z = minp.Z; z <= maxp.Z; z++) {
v3s16 p(x, y, z); v3s16 p(x, y, z);
content_t c = env->getMap().getNodeNoEx(p).getContent(); content_t c = env->getMap().getNodeNoEx(p).getContent();
if(filter.count(c) != 0) { if (filter.count(c) != 0) {
push_v3s16(L, p); push_v3s16(L, p);
lua_rawseti(L, -2, ++i); lua_rawseti(L, -2, ++i);
} individual_count[c]++;
}
} }
return 1; lua_newtable(L);
for (std::set<content_t>::iterator it = filter.begin();
it != filter.end(); ++it) {
lua_pushnumber(L, individual_count[*it]);
lua_setfield(L, -2, ndef->get(*it).name.c_str());
}
return 2;
} }
// find_nodes_in_area_under_air(minp, maxp, nodenames) -> list of positions // find_nodes_in_area_under_air(minp, maxp, nodenames) -> list of positions