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

Fix reading schematics after their resolution (#12985)

Browse Source
This commit is contained in:
Jude Melton-Houghton 2022-11-23 11:53:21 -05:00 committed by GitHub
parent 4da8a18c8c
commit 386bfcda2b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/script/lua_api/l_mapgen.cpp
View File

@ -1694,6 +1694,7 @@ int ModApiMapgen::l_read_schematic(lua_State *L)
const SchematicManager *schemmgr = const SchematicManager *schemmgr =
getServer(L)->getEmergeManager()->getSchematicManager(); getServer(L)->getEmergeManager()->getSchematicManager();
const NodeDefManager *ndef = getGameDef(L)->ndef();
//// Read options //// Read options
std::string write_yslice = getstringfield_default(L, 2, "write_yslice_prob", "all"); std::string write_yslice = getstringfield_default(L, 2, "write_yslice_prob", "all");
@ -1713,6 +1714,7 @@ int ModApiMapgen::l_read_schematic(lua_State *L)
//// Create the Lua table //// Create the Lua table
u32 numnodes = schem->size.X * schem->size.Y * schem->size.Z; u32 numnodes = schem->size.X * schem->size.Y * schem->size.Z;
bool resolve_done = schem->isResolveDone();
const std::vector<std::string> &names = schem->m_nodenames; const std::vector<std::string> &names = schem->m_nodenames;
lua_createtable(L, 0, (write_yslice == "none") ? 2 : 3); lua_createtable(L, 0, (write_yslice == "none") ? 2 : 3);
@ -1742,10 +1744,12 @@ int ModApiMapgen::l_read_schematic(lua_State *L)
lua_createtable(L, numnodes, 0); // data table lua_createtable(L, numnodes, 0); // data table
for (u32 i = 0; i < numnodes; ++i) { for (u32 i = 0; i < numnodes; ++i) {
MapNode node = schem->schemdata[i]; MapNode node = schem->schemdata[i];
const std::string &name =
resolve_done ? ndef->get(node.getContent()).name : names[node.getContent()];
u8 probability = node.param1 & MTSCHEM_PROB_MASK; u8 probability = node.param1 & MTSCHEM_PROB_MASK;
bool force_place = node.param1 & MTSCHEM_FORCE_PLACE; bool force_place = node.param1 & MTSCHEM_FORCE_PLACE;
lua_createtable(L, 0, force_place ? 4 : 3); lua_createtable(L, 0, force_place ? 4 : 3);
lua_pushstring(L, names[schem->schemdata[i].getContent()].c_str()); lua_pushstring(L, name.c_str());
lua_setfield(L, 3, "name"); lua_setfield(L, 3, "name");
lua_pushinteger(L, probability * 2); lua_pushinteger(L, probability * 2);
lua_setfield(L, 3, "prob"); lua_setfield(L, 3, "prob");