Fix sqlite3 map shutdown fails due to missing to finalize list statement

[oweals/minetest.git] / src / mapgen_math.cpp

diff --git a/src/mapgen_math.cpp b/src/mapgen_math.cpp
index f2b17896d27fb6c3a5a5d36628a58145cd0fc2ca..62b81c8effa561771614434e397768bd2d0da53c 100644 (file)
--- a/src/mapgen_math.cpp
+++ b/src/mapgen_math.cpp
@@ -147,7 +147,7 @@ double sphere(double x, double y, double z, double d, int ITR = 1) {
 
 //////////////////////// Mapgen Math parameter read/write
 
-bool MapgenMathParams::readParams(Settings *settings) {
+void MapgenMathParams::readParams(Settings *settings) {
        //params = settings->getJson("mg_math");
        // can be counfigured from here.
        std::string value = "{}";
@@ -157,8 +157,6 @@ bool MapgenMathParams::readParams(Settings *settings) {
        }
 
        if (params["generator"].empty()) params["generator"] = settings->get("mgmath_generator");
-
-       return true;
 }
 
 
@@ -169,9 +167,9 @@ void MapgenMathParams::writeParams(Settings *settings) {
 
 ///////////////////////////////////////////////////////////////////////////////
 
-MapgenMath::MapgenMath(int mapgenid, MapgenMathParams *params_, EmergeManager *emerge) : MapgenV7(mapgenid, params_, emerge) {
-       mg_params = params_;
-       this->flags |= MG_NOLIGHT;
+MapgenMath::MapgenMath(int mapgenid, MapgenParams *params_, EmergeManager *emerge) : MapgenV7(mapgenid, params_, emerge) {
+       mg_params = (MapgenMathParams *)params_;
+       this->flags &= ~MG_LIGHT;
 
        Json::Value & params = mg_params->params;
        invert = params["invert"].empty() ? 1 : params["invert"].asBool(); //params["invert"].empty()?1:params["invert"].asBool();
@@ -255,7 +253,7 @@ int MapgenMath::generateTerrain() {
        */
        for (s16 z = node_min.Z; z <= node_max.Z; z++) {
                for (s16 x = node_min.X; x <= node_max.X; x++, index++) {
-                       Biome *biome = bmgr->biomes[biomemap[index]];
+                       //Biome *biome = bmgr->biomes[biomemap[index]];
                        u32 i = vm->m_area.index(x, node_min.Y, z);
                        for (s16 y = node_min.Y; y <= node_max.Y; y++) {
                                v3f vec = (v3f(x, y, z) - center) * scale ;