Merge pull request #59 from PrairieAstronomer/readme_irrlicht_change

[dragonfireclient.git] / src / mapgen / mg_schematic.cpp

diff --git a/src/mapgen/mg_schematic.cpp b/src/mapgen/mg_schematic.cpp
index 653bad4fe5f18c71be1a5cfb428ee7b29f0e9a9c..b9ba70302a57b66f522e8edfabf85dbbd1c9bec6 100644 (file)
--- a/src/mapgen/mg_schematic.cpp
+++ b/src/mapgen/mg_schematic.cpp
@@ -339,7 +339,9 @@ bool Schematic::deserializeFromMts(std::istream *is)
        delete []schemdata;
        schemdata = new MapNode[nodecount];
 
-       MapNode::deSerializeBulk(ss, SER_FMT_VER_HIGHEST_READ, schemdata,
+       std::stringstream d_ss(std::ios_base::binary | std::ios_base::in | std::ios_base::out);
+       decompress(ss, d_ss, MTSCHEM_MAPNODE_SER_FMT_VER);
+       MapNode::deSerializeBulk(d_ss, MTSCHEM_MAPNODE_SER_FMT_VER, schemdata,
                nodecount, 2, 2);
 
        // Fix probability values for nodes that were ignore; removed in v2
@@ -384,8 +386,9 @@ bool Schematic::serializeToMts(std::ostream *os) const
        }
 
        // compressed bulk node data
-       MapNode::serializeBulk(ss, SER_FMT_VER_HIGHEST_WRITE,
-               schemdata, size.X * size.Y * size.Z, 2, 2, -1);
+       SharedBuffer<u8> buf = MapNode::serializeBulk(MTSCHEM_MAPNODE_SER_FMT_VER,
+               schemdata, size.X * size.Y * size.Z, 2, 2);
+       compress(buf, ss, MTSCHEM_MAPNODE_SER_FMT_VER);
 
        return true;
 }
@@ -598,8 +601,9 @@ void Schematic::applyProbabilities(v3s16 p0,
        }
 
        for (size_t i = 0; i != splist->size(); i++) {
-               s16 y = (*splist)[i].first - p0.Y;
-               slice_probs[y] = (*splist)[i].second;
+               s16 slice = (*splist)[i].first;
+               if (slice < size.Y)
+                       slice_probs[slice] = (*splist)[i].second;
        }
 }