GenericCAO: Fix light position for non-players, remove deprecated initialisation...

[dragonfireclient.git] / src / mapgen_singlenode.cpp

diff --git a/src/mapgen_singlenode.cpp b/src/mapgen_singlenode.cpp
index f05ddd2f4e32a137e3b3188354f1a6fc014c79b7..ee8746b832466a8dd67fe80f581f3e15dd1e6766 100644 (file)
--- a/src/mapgen_singlenode.cpp
+++ b/src/mapgen_singlenode.cpp
@@ -1,6 +1,8 @@
 /*
 Minetest
-Copyright (C) 2010-2013 celeron55, Perttu Ahola <celeron55@gmail.com>
+Copyright (C) 2013-2015 celeron55, Perttu Ahola <celeron55@gmail.com>
+Copyright (C) 2013-2016 kwolekr, Ryan Kwolek <kwolekr@minetest.net>
+Copyright (C) 2015-2017 paramat
 
 This program is free software; you can redistribute it and/or modify
 it under the terms of the GNU Lesser General Public License as published by
@@ -24,59 +26,55 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 #include "map.h"
 #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;
-}
 
+MapgenSinglenode::MapgenSinglenode(int mapgenid,
+       MapgenParams *params, EmergeManager *emerge)
+       : Mapgen(mapgenid, params, emerge)
+{
+       flags = params->flags;
 
-void MapgenSinglenodeParams::writeParams(Settings *settings) {
-}
+       INodeDefManager *ndef = emerge->ndef;
 
-///////////////////////////////////////////////////////////////////////////////
+       c_node = ndef->getId("mapgen_singlenode");
+       if (c_node == CONTENT_IGNORE)
+               c_node = CONTENT_AIR;
 
-MapgenSinglenode::MapgenSinglenode(int mapgenid, MapgenSinglenodeParams *params) {
+       MapNode n_node(c_node);
+       set_light = (ndef->get(n_node).sunlight_propagates) ? LIGHT_SUN : 0x00;
 }
 
 
-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 &&
-                  data->blockpos_requested.Y >= data->blockpos_min.Y &&
-                  data->blockpos_requested.Z >= data->blockpos_min.Z);
+               data->blockpos_requested.Y >= data->blockpos_min.Y &&
+               data->blockpos_requested.Z >= data->blockpos_min.Z);
        assert(data->blockpos_requested.X <= data->blockpos_max.X &&
-                  data->blockpos_requested.Y <= data->blockpos_max.Y &&
-                  data->blockpos_requested.Z <= data->blockpos_max.Z);
+               data->blockpos_requested.Y <= data->blockpos_max.Y &&
+               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;
 
        // Area of central chunk
-       v3s16 node_min = blockpos_min*MAP_BLOCKSIZE;
-       v3s16 node_max = (blockpos_max+v3s16(1,1,1))*MAP_BLOCKSIZE-v3s16(1,1,1);
+       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);
 
-       content_t c_node = ndef->getId("mapgen_singlenode");
-       if (c_node == CONTENT_IGNORE)
-               c_node = CONTENT_AIR;
-       
        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,14 +88,15 @@ void MapgenSinglenode::makeChunk(BlockMakeData *data) {
        // Add top and bottom side of water to transforming_liquid queue
        updateLiquid(&data->transforming_liquid, node_min, node_max);
 
-       // Calculate lighting
-       calcLighting(node_min - v3s16(1, 0, 1) * MAP_BLOCKSIZE,
-                                node_max + v3s16(1, 0, 1) * MAP_BLOCKSIZE);
-       
+       // Set lighting
+       if ((flags & MG_LIGHT) && set_light == LIGHT_SUN)
+               setLighting(LIGHT_SUN, node_min, node_max);
+
        this->generating = false;
 }
 
-int MapgenSinglenode::getGroundLevelAtPoint(v2s16 p) {
+
+int MapgenSinglenode::getSpawnLevelAtPoint(v2s16 p)
+{
        return 0;
 }
-