Fix client "double saving" simple singleplayer local maps

[minetest.git] / src / mapgen_v6.cpp

diff --git a/src/mapgen_v6.cpp b/src/mapgen_v6.cpp
index a212496a8bca679144bf4fc392c1363c057d4836..de0c8168821f0589980aaa88ed910198f4574d31 100644 (file)
--- a/src/mapgen_v6.cpp
+++ b/src/mapgen_v6.cpp
@@ -35,6 +35,8 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 #include "dungeongen.h"
 #include "cavegen.h"
 #include "treegen.h"
+#include "mg_ore.h"
+#include "mg_decoration.h"
 #include "mapgen_v6.h"
 
 FlagDesc flagdesc_mapgen_v6[] = {
@@ -71,6 +73,7 @@ MapgenV6::MapgenV6(int mapgenid, MapgenParams *params, EmergeManager *emerge) {
        np_trees       = &sp->np_trees;
        np_apple_trees = &sp->np_apple_trees;
 
+       //// Create noise objects
        noise_terrain_base   = new Noise(&sp->np_terrain_base,   seed, csize.X, csize.Y);
        noise_terrain_higher = new Noise(&sp->np_terrain_higher, seed, csize.X, csize.Y);
        noise_steepness      = new Noise(&sp->np_steepness,      seed, csize.X, csize.Y);
@@ -78,6 +81,36 @@ MapgenV6::MapgenV6(int mapgenid, MapgenParams *params, EmergeManager *emerge) {
        noise_mud            = new Noise(&sp->np_mud,            seed, csize.X, csize.Y);
        noise_beach          = new Noise(&sp->np_beach,          seed, csize.X, csize.Y);
        noise_biome          = new Noise(&sp->np_biome,          seed, csize.X, csize.Y);
+
+       //// Resolve nodes to be used
+       INodeDefManager *ndef = emerge->ndef;
+
+       c_stone           = ndef->getId("mapgen_stone");
+       c_dirt            = ndef->getId("mapgen_dirt");
+       c_dirt_with_grass = ndef->getId("mapgen_dirt_with_grass");
+       c_sand            = ndef->getId("mapgen_sand");
+       c_water_source    = ndef->getId("mapgen_water_source");
+       c_lava_source     = ndef->getId("mapgen_lava_source");
+       c_gravel          = ndef->getId("mapgen_gravel");
+       c_cobble          = ndef->getId("mapgen_cobble");
+       c_desert_sand     = ndef->getId("mapgen_desert_sand");
+       c_desert_stone    = ndef->getId("mapgen_desert_stone");
+       c_mossycobble     = ndef->getId("mapgen_mossycobble");
+       c_sandbrick       = ndef->getId("mapgen_sandstonebrick");
+       c_stair_cobble    = ndef->getId("mapgen_stair_cobble");
+       c_stair_sandstone = ndef->getId("mapgen_stair_sandstone");
+       if (c_desert_sand == CONTENT_IGNORE)
+               c_desert_sand = c_sand;
+       if (c_desert_stone == CONTENT_IGNORE)
+               c_desert_stone = c_stone;
+       if (c_mossycobble == CONTENT_IGNORE)
+               c_mossycobble = c_cobble;
+       if (c_sandbrick == CONTENT_IGNORE)
+               c_sandbrick = c_desert_stone;
+       if (c_stair_cobble == CONTENT_IGNORE)
+               c_stair_cobble = c_cobble;
+       if (c_stair_sandstone == CONTENT_IGNORE)
+               c_stair_sandstone = c_sandbrick;
 }
 
 
@@ -279,7 +312,7 @@ bool MapgenV6::getHaveBeach(v2s16 p) {
 }
 
 
-BiomeType MapgenV6::getBiome(v2s16 p) {
+BiomeV6Type MapgenV6::getBiome(v2s16 p) {
        int index = (p.Y - node_min.Z) * ystride + (p.X - node_min.X);
        return getBiome(index, p);
 }
@@ -354,7 +387,7 @@ bool MapgenV6::getHaveBeach(int index)
 }
 
 
-BiomeType MapgenV6::getBiome(int index, v2s16 p)
+BiomeV6Type MapgenV6::getBiome(int index, v2s16 p)
 {
        // Just do something very simple as for now
        /*double d = noise2d_perlin(
@@ -426,33 +459,6 @@ void MapgenV6::makeChunk(BlockMakeData *data) {
        // Make some noise
        calculateNoise();
 
-       c_stone           = ndef->getId("mapgen_stone");
-       c_dirt            = ndef->getId("mapgen_dirt");
-       c_dirt_with_grass = ndef->getId("mapgen_dirt_with_grass");
-       c_sand            = ndef->getId("mapgen_sand");
-       c_water_source    = ndef->getId("mapgen_water_source");
-       c_lava_source     = ndef->getId("mapgen_lava_source");
-       c_gravel          = ndef->getId("mapgen_gravel");
-       c_cobble          = ndef->getId("mapgen_cobble");
-       c_desert_sand     = ndef->getId("mapgen_desert_sand");
-       c_desert_stone    = ndef->getId("mapgen_desert_stone");
-       c_mossycobble     = ndef->getId("mapgen_mossycobble");
-       c_sandbrick       = ndef->getId("mapgen_sandstonebrick");
-       c_stair_cobble    = ndef->getId("mapgen_stair_cobble");
-       c_stair_sandstone = ndef->getId("mapgen_stair_sandstone");
-       if (c_desert_sand == CONTENT_IGNORE)
-               c_desert_sand = c_sand;
-       if (c_desert_stone == CONTENT_IGNORE)
-               c_desert_stone = c_stone;
-       if (c_mossycobble == CONTENT_IGNORE)
-               c_mossycobble = c_cobble;
-       if (c_sandbrick == CONTENT_IGNORE)
-               c_sandbrick = c_desert_stone;
-       if (c_stair_cobble == CONTENT_IGNORE)
-               c_stair_cobble = c_cobble;
-       if (c_stair_sandstone == CONTENT_IGNORE)
-               c_stair_sandstone = c_sandbrick;
-
        // Maximum height of the stone surface and obstacles.
        // This is used to guide the cave generation
        s16 stone_surface_max_y;
@@ -531,16 +537,10 @@ void MapgenV6::makeChunk(BlockMakeData *data) {
                placeTreesAndJungleGrass();
        
        // Generate the registered decorations
-       for (unsigned int i = 0; i != emerge->decorations.size(); i++) {
-               Decoration *deco = emerge->decorations[i];
-               deco->placeDeco(this, blockseed + i, node_min, node_max);
-       }
+       emerge->decomgr->placeAllDecos(this, blockseed, node_min, node_max);
 
        // Generate the registered ores
-       for (unsigned int i = 0; i != emerge->ores.size(); i++) {
-               Ore *ore = emerge->ores[i];
-               ore->placeOre(this, blockseed + i, node_min, node_max);
-       }
+       emerge->oremgr->placeAllOres(this, blockseed, node_min, node_max);
 
        // Calculate lighting
        if (flags & MG_LIGHT)
@@ -608,7 +608,7 @@ int MapgenV6::generateGround() {
                if (surface_y > stone_surface_max_y)
                        stone_surface_max_y = surface_y;
 
-               BiomeType bt = getBiome(index, v2s16(x, z));
+               BiomeV6Type bt = getBiome(index, v2s16(x, z));
                
                // Fill ground with stone
                v3s16 em = vm->m_area.getExtent();
@@ -652,7 +652,7 @@ void MapgenV6::addMud() {
                if (surface_y == vm->m_area.MinEdge.Y - 1)
                        continue;
                
-               BiomeType bt = getBiome(index, v2s16(x, z));
+               BiomeV6Type bt = getBiome(index, v2s16(x, z));
                addnode = (bt == BT_DESERT) ? n_desert_sand : n_dirt;
 
                if (bt == BT_DESERT && surface_y + mud_add_amount <= water_level + 1) {