Fix unit test if there isn't a localhost address (for example FreeBSD jails), second...

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

diff --git a/src/mapgen_singlenode.cpp b/src/mapgen_singlenode.cpp
index 8558b3b1427e9e06795ae11f185f45c40e2a5760..5f81aba98d39b7c8d6bedc7ed757fd9839de4274 100644 (file)
--- a/src/mapgen_singlenode.cpp
+++ b/src/mapgen_singlenode.cpp
@@ -29,11 +29,13 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 
 //////////////////////// Mapgen Singlenode parameter read/write
 
-void MapgenSinglenodeParams::readParams(Settings *settings) {
+void MapgenSinglenodeParams::readParams(Settings *settings)
+{
 }
 
 
-void MapgenSinglenodeParams::writeParams(Settings *settings) {
+void MapgenSinglenodeParams::writeParams(Settings *settings)
+{
 }
 
 ///////////////////////////////////////////////////////////////////////////////
@@ -52,12 +54,14 @@ MapgenSinglenode::MapgenSinglenode(int mapgenid,
 }
 
 
-MapgenSinglenode::~MapgenSinglenode() {
+MapgenSinglenode::~MapgenSinglenode()
+{
 }
 
 //////////////////////// Map generator
 
-void MapgenSinglenode::makeChunk(BlockMakeData *data) {
+void MapgenSinglenode::makeChunk(BlockMakeData *data)
+{
        assert(data->vmanip);
        assert(data->nodedef);
        assert(data->blockpos_requested.X >= data->blockpos_min.X &&
@@ -78,6 +82,8 @@ void MapgenSinglenode::makeChunk(BlockMakeData *data) {
        v3s16 node_min = blockpos_min*MAP_BLOCKSIZE;
        v3s16 node_max = (blockpos_max+v3s16(1,1,1))*MAP_BLOCKSIZE-v3s16(1,1,1);
 
+       blockseed = getBlockSeed2(node_min, data->seed);
+
        MapNode n_node(c_node);
 
        for (s16 z = node_min.Z; z <= node_max.Z; z++)
@@ -95,13 +101,13 @@ void MapgenSinglenode::makeChunk(BlockMakeData *data) {
 
        // Calculate lighting
        if (flags & MG_LIGHT)
-               calcLighting(node_min - v3s16(1, 0, 1) * MAP_BLOCKSIZE,
-                                        node_max + v3s16(1, 0, 1) * MAP_BLOCKSIZE);
+               calcLighting(node_min, node_max);
 
        this->generating = false;
 }
 
-int MapgenSinglenode::getGroundLevelAtPoint(v2s16 p) {
+int MapgenSinglenode::getGroundLevelAtPoint(v2s16 p)
+{
        return 0;
 }