Omnicleanup: header cleanup, add ModApiUtil shared between game and mainmenu

[dragonfireclient.git] / src / mapgen_singlenode.cpp

diff --git a/src/mapgen_singlenode.cpp b/src/mapgen_singlenode.cpp
index 7fa56eaf14bfbdd015b1bd7f2fe6f32ee619e4c1..fd443995c6ef50a0c9040f484260ff82a5266baa 100644 (file)
--- a/src/mapgen_singlenode.cpp
+++ b/src/mapgen_singlenode.cpp
@@ -25,8 +25,6 @@ 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
@@ -42,6 +40,7 @@ void MapgenSinglenodeParams::writeParams(Settings *settings) {
 ///////////////////////////////////////////////////////////////////////////////
 
 MapgenSinglenode::MapgenSinglenode(int mapgenid, MapgenSinglenodeParams *params) {
+       flags = params->flags;
 }
 
 
@@ -76,21 +75,24 @@ void MapgenSinglenode::makeChunk(BlockMakeData *data) {
                c_node = CONTENT_AIR;
        
        MapNode n_node(c_node);
-       int i = 0;
        
-       for (s16 z=node_min.Z; z<=node_max.Z; z++)
-       for (s16 y=node_min.Y; y<=node_max.Y; y++)
-       for (s16 x=node_min.X; x<=node_max.X; x++) {
-               if (vm->m_data[i].getContent() == CONTENT_IGNORE)
-                       vm->m_data[i] = n_node;
-               i++;
+       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);
+               for (s16 x = node_min.X; x <= node_max.X; x++) {
+                       if (vm->m_data[i].getContent() == CONTENT_IGNORE)
+                               vm->m_data[i] = n_node;
+                       i++;
+               }
        }
 
        // Add top and bottom side of water to transforming_liquid queue
        updateLiquid(&data->transforming_liquid, node_min, node_max);
 
        // Calculate lighting
-       calcLighting(node_min, node_max);
+       if (!(flags & MG_NOLIGHT))
+               calcLighting(node_min - v3s16(1, 0, 1) * MAP_BLOCKSIZE,
+                                        node_max + v3s16(1, 0, 1) * MAP_BLOCKSIZE);
        
        this->generating = false;
 }