Fix players spawned at (0,0,0) in some rare cases instead of static_spawnpoint, if set

[dragonfireclient.git] / src / mapgen_v5.cpp

diff --git a/src/mapgen_v5.cpp b/src/mapgen_v5.cpp
index 6adfac55be81540be536e73449e55494481af97d..59578eb4980bbe7deb37d83a5bea664e90fae84d 100644 (file)
--- a/src/mapgen_v5.cpp
+++ b/src/mapgen_v5.cpp
@@ -29,7 +29,6 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 #include "voxelalgorithms.h"
 #include "profiler.h"
 #include "settings.h" // For g_settings
-#include "main.h" // For g_profiler
 #include "emerge.h"
 #include "dungeongen.h"
 #include "cavegen.h"
@@ -377,9 +376,9 @@ int MapgenV5::generateBaseTerrain()
                                                stone_surface_max_y = y;
                                }
                        }
-                       index2d = index2d - ystride;
+                       index2d -= ystride;
                }
-               index2d = index2d + ystride;
+               index2d += ystride;
        }
 
        return stone_surface_max_y;
@@ -391,10 +390,6 @@ bool MapgenV5::generateBiomes(float *heat_map, float *humidity_map)
        if (node_max.Y < water_level)
                return false;
 
-       MapNode n_air(CONTENT_AIR);
-       MapNode n_stone(c_stone);
-       MapNode n_water(c_water_source);
-
        v3s16 em = vm->m_area.getExtent();
        u32 index = 0;
        bool desert_stone = false;
@@ -483,7 +478,7 @@ void MapgenV5::generateCaves(int max_stone_y)
                for (s16 y=node_min.Y - 1; y<=node_max.Y + 1; y++) {
                        u32 i = vm->m_area.index(node_min.X, y, z);
                        for (s16 x=node_min.X; x<=node_max.X; x++, i++, index++, index2d++) {
-                               Biome *biome = (Biome *)bmgr->get(biomemap[index2d]);
+                               Biome *biome = (Biome *)bmgr->getRaw(biomemap[index2d]);
                                content_t c = vm->m_data[i].getContent();
                                if (c == CONTENT_AIR
                                                || (y <= water_level
@@ -496,12 +491,12 @@ void MapgenV5::generateCaves(int max_stone_y)
                                if (d1*d2 > 0.125)
                                        vm->m_data[i] = MapNode(CONTENT_AIR);
                        }
-                       index2d = index2d - ystride;
+                       index2d -= ystride;
                }
-               index2d = index2d + ystride;
+               index2d += ystride;
        }
 
-       if (node_max.Y > -256)
+       if (node_max.Y > LARGE_CAVE_DEPTH)
                return;
 
        PseudoRandom ps(blockseed + 21343);
@@ -523,14 +518,31 @@ void MapgenV5::dustTopNodes()
 
        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 = (Biome *)bmgr->get(biomemap[index]);
+               Biome *biome = (Biome *)bmgr->getRaw(biomemap[index]);
 
                if (biome->c_dust == CONTENT_IGNORE)
                        continue;
 
-               s16 y = node_max.Y + 1;
-               u32 vi = vm->m_area.index(x, y, z);
-               for (; y >= node_min.Y; y--) {
+               u32 vi = vm->m_area.index(x, full_node_max.Y, z);
+               content_t c_full_max = vm->m_data[vi].getContent();
+               s16 y_start;
+
+               if (c_full_max == CONTENT_AIR) {
+                       y_start = full_node_max.Y - 1;
+               } else if (c_full_max == CONTENT_IGNORE) {
+                       vi = vm->m_area.index(x, node_max.Y + 1, z);
+                       content_t c_max = vm->m_data[vi].getContent();
+
+                       if (c_max == CONTENT_AIR)
+                               y_start = node_max.Y;
+                       else
+                               continue;
+               } else {
+                       continue;
+               }
+
+               vi = vm->m_area.index(x, y_start, z);
+               for (s16 y = y_start; y >= node_min.Y - 1; y--) {
                        if (vm->m_data[vi].getContent() != CONTENT_AIR)
                                break;
 
@@ -538,11 +550,7 @@ void MapgenV5::dustTopNodes()
                }
 
                content_t c = vm->m_data[vi].getContent();
-               if (!ndef->get(c).buildable_to && c != CONTENT_IGNORE
-                               && c != biome->c_dust) {
-                       if (y == node_max.Y + 1)
-                               continue;
-
+               if (!ndef->get(c).buildable_to && c != CONTENT_IGNORE && c != biome->c_dust) {
                        vm->m_area.add_y(em, vi, 1);
                        vm->m_data[vi] = MapNode(biome->c_dust);
                }