Skip to content
Permalink
Browse files

Schematic: Read slice probability table from schematic descriptors

  • Loading branch information
kwolekr committed Jan 19, 2014
1 parent 66b24cc commit 21c96249fa6e9d4c65b4d897d4b6e2f48371e620
Showing with 24 additions and 3 deletions.
  1. +1 −0 src/mapgen.cpp
  2. +23 −3 src/script/common/c_content.cpp
@@ -789,6 +789,7 @@ bool DecoSchematic::loadSchematicFile() {
Version changes:
1 - Initial version
2 - Fixed messy never/always place; 0 probability is now never, 0xFF is always
3 - Added y-slice probabilities; this allows for variable height structures
*/
void DecoSchematic::saveSchematicFile(INodeDefManager *ndef) {
std::ostringstream ss(std::ios_base::binary);
@@ -958,6 +958,7 @@ bool read_schematic(lua_State *L, int index, DecoSchematic *dschem, Server *serv
MapNode *schemdata = new MapNode[numnodes];
int i = 0;

// Get schematic data
lua_getfield(L, index, "data");
luaL_checktype(L, -1, LUA_TTABLE);

@@ -986,15 +987,34 @@ bool read_schematic(lua_State *L, int index, DecoSchematic *dschem, Server *serv
lua_pop(L, 1);
}

dschem->size = size;
dschem->schematic = schemdata;

if (i != numnodes) {
errorstream << "read_schematic: incorrect number of "
"nodes provided in raw schematic data (got " << i <<
", expected " << numnodes << ")." << std::endl;
return false;
}

u8 *sliceprobs = new u8[size.Y];
for (i = 0; i != size.Y; i++)
sliceprobs[i] = MTSCHEM_PROB_ALWAYS;

// Get Y-slice probability values (if present)
lua_getfield(L, index, "yslice_prob");
if (lua_istable(L, -1)) {
lua_pushnil(L);
while (lua_next(L, -2)) {
if (getintfield(L, -1, "ypos", i) && i >= 0 && i < size.Y) {
sliceprobs[i] = getintfield_default(L, -1,
"prob", MTSCHEM_PROB_ALWAYS);
}
lua_pop(L, 1);
}
}

dschem->size = size;
dschem->schematic = schemdata;
dschem->slice_probs = sliceprobs;

} else if (lua_isstring(L, index)) {
dschem->filename = std::string(lua_tostring(L, index));
} else {

0 comments on commit 21c9624

Please sign in to comment.
You can’t perform that action at this time.