Fix on_rightclick() being called directly after placing node

[dragonfireclient.git] / src / mapgen.cpp

diff --git a/src/mapgen.cpp b/src/mapgen.cpp
index 7965730e48cc4efbed72d3772bef66e439eb397f..8a77000fae9010de1cb1c6905d0b93eae3942acf 100644 (file)
--- a/src/mapgen.cpp
+++ b/src/mapgen.cpp
@@ -29,7 +29,6 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 #include "content_sao.h"
 #include "nodedef.h"
 #include "emerge.h"
-#include "content_mapnode.h" // For content_mapnode_get_new_name
 #include "voxelalgorithms.h"
 #include "porting.h"
 #include "profiler.h"
@@ -62,38 +61,43 @@ FlagDesc flagdesc_gennotify[] = {
 };
 
 
-///////////////////////////////////////////////////////////////////////////////
-
+////
+//// Mapgen
+////
 
 Mapgen::Mapgen()
 {
-       generating    = false;
-       id            = -1;
-       seed          = 0;
-       water_level   = 0;
-       flags         = 0;
-
-       vm          = NULL;
-       ndef        = NULL;
-       heightmap   = NULL;
-       biomemap    = NULL;
+       generating  = false;
+       id          = -1;
+       seed        = 0;
+       water_level = 0;
+       flags       = 0;
+
+       vm        = NULL;
+       ndef      = NULL;
+       heightmap = NULL;
+       biomemap  = NULL;
+       heatmap   = NULL;
+       humidmap  = NULL;
 }
 
 
 Mapgen::Mapgen(int mapgenid, MapgenParams *params, EmergeManager *emerge) :
        gennotify(emerge->gen_notify_on, &emerge->gen_notify_on_deco_ids)
 {
-       generating    = false;
-       id            = mapgenid;
-       seed          = (int)params->seed;
-       water_level   = params->water_level;
-       flags         = params->flags;
-       csize         = v3s16(1, 1, 1) * (params->chunksize * MAP_BLOCKSIZE);
+       generating  = false;
+       id          = mapgenid;
+       seed        = (int)params->seed;
+       water_level = params->water_level;
+       flags       = params->flags;
+       csize       = v3s16(1, 1, 1) * (params->chunksize * MAP_BLOCKSIZE);
 
        vm        = NULL;
        ndef      = NULL;
        heightmap = NULL;
        biomemap  = NULL;
+       heatmap   = NULL;
+       humidmap  = NULL;
 }
 
 
@@ -139,7 +143,7 @@ s16 Mapgen::findGroundLevelFull(v2s16 p2d)
 }
 
 
-// Returns -MAP_GENERATION_LIMIT if not found
+// Returns -MAX_MAP_GENERATION_LIMIT if not found
 s16 Mapgen::findGroundLevel(v2s16 p2d, s16 ymin, s16 ymax)
 {
        v3s16 em = vm->m_area.getExtent();
@@ -153,7 +157,27 @@ s16 Mapgen::findGroundLevel(v2s16 p2d, s16 ymin, s16 ymax)
 
                vm->m_area.add_y(em, i, -1);
        }
-       return (y >= ymin) ? y : -MAP_GENERATION_LIMIT;
+       return (y >= ymin) ? y : -MAX_MAP_GENERATION_LIMIT;
+}
+
+
+// Returns -MAX_MAP_GENERATION_LIMIT if not found or if ground is found first
+s16 Mapgen::findLiquidSurface(v2s16 p2d, s16 ymin, s16 ymax)
+{
+       v3s16 em = vm->m_area.getExtent();
+       u32 i = vm->m_area.index(p2d.X, ymax, p2d.Y);
+       s16 y;
+
+       for (y = ymax; y >= ymin; y--) {
+               MapNode &n = vm->m_data[i];
+               if (ndef->get(n).walkable)
+                       return -MAX_MAP_GENERATION_LIMIT;
+               else if (ndef->get(n).isLiquid())
+                       break;
+
+               vm->m_area.add_y(em, i, -1);
+       }
+       return (y >= ymin) ? y : -MAX_MAP_GENERATION_LIMIT;
 }
 
 
@@ -337,32 +361,9 @@ void Mapgen::spreadLight(v3s16 nmin, v3s16 nmax)
 }
 
 
-
-void Mapgen::calcLightingOld(v3s16 nmin, v3s16 nmax)
-{
-       enum LightBank banks[2] = {LIGHTBANK_DAY, LIGHTBANK_NIGHT};
-       VoxelArea a(nmin, nmax);
-       bool block_is_underground = (water_level > nmax.Y);
-       bool sunlight = !block_is_underground;
-
-       ScopeProfiler sp(g_profiler, "EmergeThread: mapgen lighting update", SPT_AVG);
-
-       for (int i = 0; i < 2; i++) {
-               enum LightBank bank = banks[i];
-               std::set<v3s16> light_sources;
-               std::map<v3s16, u8> unlight_from;
-
-               voxalgo::clearLightAndCollectSources(*vm, a, bank, ndef,
-                       light_sources, unlight_from);
-               voxalgo::propagateSunlight(*vm, a, sunlight, light_sources, ndef);
-
-               vm->unspreadLight(bank, unlight_from, light_sources, ndef);
-               vm->spreadLight(bank, light_sources, ndef);
-       }
-}
-
-
-///////////////////////////////////////////////////////////////////////////////
+////
+//// GenerateNotifier
+////
 
 GenerateNotifier::GenerateNotifier()
 {
@@ -428,7 +429,10 @@ void GenerateNotifier::getEvents(
                m_notify_events.clear();
 }
 
-///////////////////////////////////////////////////////////////////////////////
+
+////
+//// MapgenParams
+////
 
 void MapgenParams::load(const Settings &settings)
 {
@@ -445,12 +449,16 @@ void MapgenParams::load(const Settings &settings)
        settings.getS16NoEx("chunksize", chunksize);
        settings.getFlagStrNoEx("mg_flags", flags, flagdesc_mapgen);
        settings.getNoiseParams("mg_biome_np_heat", np_biome_heat);
+       settings.getNoiseParams("mg_biome_np_heat_blend", np_biome_heat_blend);
        settings.getNoiseParams("mg_biome_np_humidity", np_biome_humidity);
+       settings.getNoiseParams("mg_biome_np_humidity_blend", np_biome_humidity_blend);
 
        delete sparams;
-       sparams = EmergeManager::createMapgenParams(mg_name);
-       if (sparams)
+       MapgenFactory *mgfactory = EmergeManager::getMapgenFactory(mg_name);
+       if (mgfactory) {
+               sparams = mgfactory->createMapgenParams();
                sparams->readParams(&settings);
+       }
 }
 
 
@@ -460,11 +468,12 @@ void MapgenParams::save(Settings &settings) const
        settings.setU64("seed", seed);
        settings.setS16("water_level", water_level);
        settings.setS16("chunksize", chunksize);
-       settings.setFlagStr("mg_flags", flags, flagdesc_mapgen, (u32)-1);
+       settings.setFlagStr("mg_flags", flags, flagdesc_mapgen, U32_MAX);
        settings.setNoiseParams("mg_biome_np_heat", np_biome_heat);
+       settings.setNoiseParams("mg_biome_np_heat_blend", np_biome_heat_blend);
        settings.setNoiseParams("mg_biome_np_humidity", np_biome_humidity);
+       settings.setNoiseParams("mg_biome_np_humidity_blend", np_biome_humidity_blend);
 
        if (sparams)
                sparams->writeParams(&settings);
 }
-