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 1471e064b8e893376671f4b16baacdcf9bdaafe2..5f81aba98d39b7c8d6bedc7ed757fd9839de4274 100644 (file)
--- a/src/mapgen_singlenode.cpp
+++ b/src/mapgen_singlenode.cpp
@@ -29,26 +29,39 @@ 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)
+{
 }
 
 ///////////////////////////////////////////////////////////////////////////////
 
-MapgenSinglenode::MapgenSinglenode(int mapgenid, MapgenParams *params) {
+MapgenSinglenode::MapgenSinglenode(int mapgenid,
+       MapgenParams *params, EmergeManager *emerge)
+       : Mapgen(mapgenid, params, emerge)
+{
        flags = params->flags;
+
+       INodeDefManager *ndef = emerge->ndef;
+
+       c_node = ndef->getId("mapgen_singlenode");
+       if (c_node == CONTENT_IGNORE)
+               c_node = CONTENT_AIR;
 }
 
 
-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 &&
@@ -59,9 +72,9 @@ void MapgenSinglenode::makeChunk(BlockMakeData *data) {
                   data->blockpos_requested.Z <= data->blockpos_max.Z);
 
        this->generating = true;
-       this->vm   = data->vmanip;      
+       this->vm   = data->vmanip;
        this->ndef = data->nodedef;
-                       
+
        v3s16 blockpos_min = data->blockpos_min;
        v3s16 blockpos_max = data->blockpos_max;
 
@@ -69,12 +82,10 @@ 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);
 
-       content_t c_node = ndef->getId("mapgen_singlenode");
-       if (c_node == CONTENT_IGNORE)
-               c_node = CONTENT_AIR;
-       
+       blockseed = getBlockSeed2(node_min, data->seed);
+
        MapNode n_node(c_node);
-       
+
        for (s16 z = node_min.Z; z <= node_max.Z; z++)
        for (s16 y = node_min.Y; y <= node_max.Y; y++) {
                u32 i = vm->m_area.index(node_min.X, y, z);
@@ -90,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;
 }