From a80025c352fb91ff295423940b3ded22755b70f0 Mon Sep 17 00:00:00 2001 From: Perttu Ahola Date: Sat, 25 Jun 2011 18:35:32 +0300 Subject: moved mapgen stuff around abit --- src/map.h | 55 ++++++------------------------------------------------- 1 file changed, 6 insertions(+), 49 deletions(-) (limited to 'src/map.h') 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 &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 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 transforming_liquid; - - BlockMakeData(): - no_op(false), - vmanip(NULL), - seed(0) - {} -}; - -void makeBlock(BlockMakeData *data); - #endif -- cgit v1.2.3