Include irrlichttypes.h first to work around Irrlicht#433 (#10872)

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

diff --git a/src/mapgen/mapgen_singlenode.cpp b/src/mapgen/mapgen_singlenode.cpp
index a4cde7ecec7fc069bb88cc07e44a0fa2178f269f..5382423fa1e7835444b086d331a00f0cd99fc7b1 100644 (file)
--- a/src/mapgen/mapgen_singlenode.cpp
+++ b/src/mapgen/mapgen_singlenode.cpp
@@ -29,12 +29,9 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 #include "emerge.h"
 
 
-MapgenSinglenode::MapgenSinglenode(int mapgenid,
-       MapgenParams *params, EmergeManager *emerge)
-       : Mapgen(mapgenid, params, emerge)
+MapgenSinglenode::MapgenSinglenode(MapgenParams *params, EmergeParams *emerge)
+       : Mapgen(MAPGEN_SINGLENODE, params, emerge)
 {
-       flags = params->flags;
-
        const NodeDefManager *ndef = emerge->ndef;
 
        c_node = ndef->getId("mapgen_singlenode");
@@ -53,12 +50,6 @@ 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);
-       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);
 
        this->generating = true;
        this->vm   = data->vmanip;