oss/luanti
oss/luanti
1
0
Fork 0
mirror of https://github.com/luanti-org/luanti.git synced 2025-06-27 16:36:03 +00:00
Code Wiki Activity

moved mapgen stuff around abit

Browse source
This commit is contained in:
Perttu Ahola 2011-06-25 18:35:32 +03:00
parent f2c26e2014
commit a80025c352
4 changed files with 61 additions and 74 deletions
Download patch file Download diff file Expand all files Collapse all files

55
src/map.h
View file

@ -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