Revert "Make Lint Happy"

[dragonfireclient.git] / src / mapgen / mapgen_singlenode.cpp

diff --git a/src/mapgen/mapgen_singlenode.cpp b/src/mapgen/mapgen_singlenode.cpp
index 6724e5fe7b4832ddec95a0f29171b4cb649b6da4..cade9e7a8b71339b381301f85b37ca0a604f0e4b 100644 (file)
--- a/src/mapgen/mapgen_singlenode.cpp
+++ b/src/mapgen/mapgen_singlenode.cpp
@@ -28,8 +28,9 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 #include "voxelalgorithms.h"
 #include "emerge.h"
 
-MapgenSinglenode::MapgenSinglenode(MapgenParams *params, EmergeParams *emerge) :
-               Mapgen(MAPGEN_SINGLENODE, params, emerge)
+
+MapgenSinglenode::MapgenSinglenode(MapgenParams *params, EmergeParams *emerge)
+       : Mapgen(MAPGEN_SINGLENODE, params, emerge)
 {
        const NodeDefManager *ndef = emerge->ndef;
 
@@ -41,6 +42,7 @@ MapgenSinglenode::MapgenSinglenode(MapgenParams *params, EmergeParams *emerge) :
        set_light = (ndef->get(n_node).sunlight_propagates) ? LIGHT_SUN : 0x00;
 }
 
+
 //////////////////////// Map generator
 
 void MapgenSinglenode::makeChunk(BlockMakeData *data)
@@ -49,14 +51,14 @@ void MapgenSinglenode::makeChunk(BlockMakeData *data)
        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;
@@ -71,14 +73,14 @@ void MapgenSinglenode::makeChunk(BlockMakeData *data)
        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);
-                       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 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);
@@ -90,6 +92,7 @@ void MapgenSinglenode::makeChunk(BlockMakeData *data)
        this->generating = false;
 }
 
+
 int MapgenSinglenode::getSpawnLevelAtPoint(v2s16 p)
 {
        return 0;