Remove unused variable Client::m_active_blocks

[dragonfireclient.git] / src / mapgen_singlenode.cpp

diff --git a/src/mapgen_singlenode.cpp b/src/mapgen_singlenode.cpp
index 22b756abba513de587b7ff01846dcc71f6f84b64..a40020ab356197f569aee6f4b8f5dfda4214e2f2 100644 (file)
--- a/src/mapgen_singlenode.cpp
+++ b/src/mapgen_singlenode.cpp
@@ -25,32 +25,32 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 #include "nodedef.h"
 #include "voxelalgorithms.h"
 #include "profiler.h"
-#include "settings.h" // For g_settings
-#include "main.h" // For g_profiler
 #include "emerge.h"
 
-//////////////////////// Mapgen Singlenode parameter read/write
 
-bool MapgenSinglenodeParams::readParams(Settings *settings) {
-       return true;
-}
-
-
-void MapgenSinglenodeParams::writeParams(Settings *settings) {
-}
+MapgenSinglenode::MapgenSinglenode(int mapgenid,
+       MapgenParams *params, EmergeManager *emerge)
+       : Mapgen(mapgenid, params, emerge)
+{
+       flags = params->flags;
 
-///////////////////////////////////////////////////////////////////////////////
+       INodeDefManager *ndef = emerge->ndef;
 
-MapgenSinglenode::MapgenSinglenode(int mapgenid, MapgenSinglenodeParams *params) {
+       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)
+{
+       // Pre-conditions
        assert(data->vmanip);
        assert(data->nodedef);
        assert(data->blockpos_requested.X >= data->blockpos_min.X &&
@@ -61,9 +61,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;
 
@@ -71,12 +71,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);
@@ -91,12 +89,14 @@ void MapgenSinglenode::makeChunk(BlockMakeData *data) {
        updateLiquid(&data->transforming_liquid, node_min, node_max);
 
        // Calculate lighting
-       calcLighting(node_min, node_max);
-       
+       if (flags & MG_LIGHT)
+               calcLighting(node_min, node_max);
+
        this->generating = false;
 }
 
-int MapgenSinglenode::getGroundLevelAtPoint(v2s16 p) {
+int MapgenSinglenode::getGroundLevelAtPoint(v2s16 p)
+{
        return 0;
 }