projects
/
oweals
/
minetest.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Readded and optimized mapgen V6
[oweals/minetest.git]
/
src
/
map.h
diff --git
a/src/map.h
b/src/map.h
index 30cf626bb7d7aa15b06ea5684483dc6d724d35e3..3097d15b9fcc52549919ac1008d97118f55f4c21 100644
(file)
--- a/
src/map.h
+++ b/
src/map.h
@@
-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 "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"
#include "modifiedstate.h"
#include "util/container.h"
#include "nodetimer.h"
@@
-46,9
+47,6
@@
class NodeMetadata;
class IGameDef;
class IRollbackReportSink;
class IGameDef;
class IRollbackReportSink;
-namespace mapgen{
- struct BlockMakeData;
-};
/*
MapEditEvent
/*
MapEditEvent
@@
-360,7
+358,7
@@
public:
/*
savedir: directory to which map data should be saved
*/
/*
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
~ServerMap();
s32 mapType() const
@@
-379,15
+377,15
@@
public:
/*
Blocks are generated by using these and makeBlock().
*/
/*
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);
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
v3s16 p,
core::map<v3s16, MapBlock*> &modified_blocks
- );
+ );
*/
/*
Get a block from somewhere.
/*
Get a block from somewhere.
@@
-400,9
+398,10
@@
public:
Forcefully get a block from somewhere.
- Memory
- Load from disk
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);
// Helper for placing objects on ground level
s16 findGroundLevel(v2s16 p2d);
@@
-479,6
+478,7
@@
public:
u64 getSeed(){ return m_seed; }
u64 getSeed(){ return m_seed; }
+ EmergeManager *m_emerge;
private:
// Seed used for all kinds of randomness in generation
u64 m_seed;
private:
// Seed used for all kinds of randomness in generation
u64 m_seed;