diff options
Diffstat (limited to 'src/map.h')
| -rw-r--r-- | src/map.h | 22 |
1 files changed, 11 insertions, 11 deletions
@@ -30,6 +30,7 @@ with this program; if not, write to the Free Software Foundation, Inc., #include "mapnode.h" #include "constants.h" #include "voxel.h" +#include "mapgen.h" //for BlockMakeData and EmergeManager #include "modifiedstate.h" #include "util/container.h" #include "nodetimer.h" @@ -46,9 +47,6 @@ class NodeMetadata; class IGameDef; class IRollbackReportSink; -namespace mapgen{ - struct BlockMakeData; -}; /* MapEditEvent @@ -360,7 +358,7 @@ public: /* savedir: directory to which map data should be saved */ - ServerMap(std::string savedir, IGameDef *gamedef); + ServerMap(std::string savedir, IGameDef *gamedef, EmergeManager *emerge); ~ServerMap(); s32 mapType() const @@ -379,15 +377,15 @@ public: /* Blocks are generated by using these and makeBlock(). */ - void initBlockMake(mapgen::BlockMakeData *data, v3s16 blockpos); - MapBlock* finishBlockMake(mapgen::BlockMakeData *data, + void initBlockMake(BlockMakeData *data, v3s16 blockpos); + MapBlock* finishBlockMake(BlockMakeData *data, core::map<v3s16, MapBlock*> &changed_blocks); - // A non-threaded wrapper to the above - MapBlock * generateBlock( + // A non-threaded wrapper to the above - DEFUNCT +/* MapBlock * generateBlock( v3s16 p, core::map<v3s16, MapBlock*> &modified_blocks - ); + );*/ /* Get a block from somewhere. @@ -400,9 +398,10 @@ public: Forcefully get a block from somewhere. - Memory - Load from disk - - Generate + - Create blank filled with CONTENT_IGNORE + */ - MapBlock * emergeBlock(v3s16 p, bool allow_generate=true); + MapBlock * emergeBlock(v3s16 p, bool create_blank=true); // Helper for placing objects on ground level s16 findGroundLevel(v2s16 p2d); @@ -479,6 +478,7 @@ public: u64 getSeed(){ return m_seed; } + EmergeManager *m_emerge; private: // Seed used for all kinds of randomness in generation u64 m_seed; |