moved mapgen stuff around abit

1 files changed, 6 insertions, 49 deletions

diff --git a/src/map.h b/src/map.h
index ada17cd7e..86b6b6e18 100644
--- a/src/map.h
+++ b/src/map.h
@@ -41,6 +41,10 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 #include "mapchunk.h"
 #include "nodemetadata.h"
 
+namespace mapgen{
+	struct BlockMakeData;
+};
+
 /*
 	MapEditEvent
 */
@@ -333,10 +337,6 @@ protected:
 	This is the only map class that is able to generate map.
 */
 
-//struct ChunkMakeData;
-
-struct BlockMakeData;
-
 class ServerMap : public Map
 {
 public:
@@ -362,8 +362,8 @@ public:
 	/*
 		Blocks are generated by using these and makeBlock().
 	*/
-	void initBlockMake(BlockMakeData *data, v3s16 blockpos);
-	MapBlock* finishBlockMake(BlockMakeData *data,
+	void initBlockMake(mapgen::BlockMakeData *data, v3s16 blockpos);
+	MapBlock* finishBlockMake(mapgen::BlockMakeData *data,
 			core::map<v3s16, MapBlock*> &changed_blocks);
 	
 	// A non-threaded wrapper to the above
@@ -670,48 +670,5 @@ protected:
 	bool m_create_area;
 };
 
-#if 0
-struct ChunkMakeData
-{
-	bool no_op;
-	ManualMapVoxelManipulator vmanip;
-	u64 seed;
-	v2s16 chunkpos;
-	s16 y_blocks_min;
-	s16 y_blocks_max;
-	v2s16 sectorpos_base;
-	s16 sectorpos_base_size;
-	v2s16 sectorpos_bigbase;
-	s16 sectorpos_bigbase_size;
-	s16 max_spread_amount;
-	UniqueQueue<v3s16> transforming_liquid;
-
-	ChunkMakeData():
-		no_op(false),
-		vmanip(NULL),
-		seed(0)
-	{}
-};
-
-void makeChunk(ChunkMakeData *data);
-#endif
-
-struct BlockMakeData
-{
-	bool no_op;
-	ManualMapVoxelManipulator vmanip;
-	u64 seed;
-	v3s16 blockpos;
-	UniqueQueue<v3s16> transforming_liquid;
-
-	BlockMakeData():
-		no_op(false),
-		vmanip(NULL),
-		seed(0)
-	{}
-};
-
-void makeBlock(BlockMakeData *data);
-
 #endif