minetest
/
minetest
mirror of https://github.com/minetest/minetest.git
1
0
Fork 0
Code Issues Releases Wiki Activity

Schematics: Fix minetest.place_schematic() when defined by a Lua table

This commit is contained in:
kwolekr 2014-12-06 18:39:05 -05:00
parent 60feb4ad25
commit 390c0cd691
2 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/mg_schematic.cpp
View File

@ -57,7 +57,7 @@ void Schematic::updateContentIds()
flags |= SCHEM_CIDS_UPDATED;
for (int i = 0; i != size.X * size.Y * size.Z; i++)
for (size_t i = 0; i != size.X * size.Y * size.Z; i++)
schemdata[i].setContent(c_nodes[schemdata[i].getContent()]);
}

11
src/script/common/c_content.cpp
View File

@ -267,7 +267,7 @@ ContentFeatures read_content_features(lua_State *L, int index)
lua_getfield(L, index, "on_rightclick");
f.rightclickable = lua_isfunction(L, -1);
lua_pop(L, 1);
/* Name */
getstringfield(L, index, "name", f.name);
@ -1039,7 +1039,7 @@ bool read_schematic(lua_State *L, int index, Schematic *schem,
//// Get schematic data
lua_getfield(L, index, "data");
luaL_checktype(L, -1, LUA_TTABLE);
int numnodes = size.X * size.Y * size.Z;
MapNode *schemdata = new MapNode[numnodes];
int i = 0;
@ -1069,7 +1069,7 @@ bool read_schematic(lua_State *L, int index, Schematic *schem,
schemdata[i] = MapNode(ndef, name, param1, param2);
}
i++;
lua_pop(L, 1);
}
@ -1098,7 +1098,10 @@ bool read_schematic(lua_State *L, int index, Schematic *schem,
}
}
schem->flags = 0;
// Here, we read the nodes directly from the INodeDefManager - there is no
// need for pending node resolutions so we'll mark this schematic as updated
schem->flags = SCHEM_CIDS_UPDATED;
schem->size = size;
schem->schemdata = schemdata;
schem->slice_probs = slice_probs;