Fix MinGW build

[dragonfireclient.git] / src / mapgen_math.cpp

diff --git a/src/mapgen_math.cpp b/src/mapgen_math.cpp
index 775d0523de32647f817d216a9c9bb925482b4171..7748895b53334467d496a4e7cde9245cf1127eb3 100644 (file)
--- a/src/mapgen_math.cpp
+++ b/src/mapgen_math.cpp
@@ -145,7 +145,7 @@ double sphere(double x, double y, double z, double d, int ITR = 1) {
 }
 
 
-//////////////////////// Mapgen Singlenode parameter read/write
+//////////////////////// Mapgen Math parameter read/write
 
 bool MapgenMathParams::readParams(Settings *settings) {
        //params = settings->getJson("mg_math");
@@ -171,6 +171,7 @@ void MapgenMathParams::writeParams(Settings *settings) {
 
 MapgenMath::MapgenMath(int mapgenid, MapgenMathParams *params_, EmergeManager *emerge) : MapgenV7(mapgenid, params_, emerge) {
        mg_params = params_;
+       this->flags |= MG_NOLIGHT;
 
        Json::Value & params = mg_params->params;
        invert = params["invert"].empty() ? 1 : params["invert"].asBool(); //params["invert"].empty()?1:params["invert"].asBool();
@@ -236,9 +237,9 @@ MapgenMath::~MapgenMath() {
 
 //////////////////////// Map generator
 
-void MapgenMath::generateTerrain() {
+int MapgenMath::generateTerrain() {
 
-       MapNode n_air(CONTENT_AIR), n_water_source(c_water_source, LIGHT_SUN);
+       MapNode n_air(CONTENT_AIR, LIGHT_SUN), n_water_source(c_water_source, LIGHT_SUN);
        MapNode n_stone(c_stone, LIGHT_SUN);
        u32 index = 0;
        v3s16 em = vm->m_area.getExtent();
@@ -254,15 +255,16 @@ void 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 ;
                                double d = (*func)(vec.X, vec.Y, vec.Z, distance, iterations);
                                if ((!invert && d > 0) || (invert && d == 0)  ) {
                                        if (vm->m_data[i].getContent() == CONTENT_IGNORE)
-                                               vm->m_data[i] = (y > water_level + biome->filler_height) ?
-                                                               MapNode(biome->c_filler) : n_stone;
+       //                                      vm->m_data[i] = (y > water_level + biome->filler) ?
+               //                                              MapNode(biome->c_filler) : n_stone;
+                                               vm->m_data[i] = n_stone;
                                } else if (y <= water_level) {
                                        vm->m_data[i] = n_water_source;
                                } else {
@@ -358,7 +360,7 @@ void MapgenMath::generateTerrain() {
 
 
 #endif
-
+       return 0;
 }
 
 int MapgenMath::getGroundLevelAtPoint(v2s16 p) {