summaryrefslogtreecommitdiff
path: root/src/map.h
diff options
context:
space:
mode:
authorkwolekr <kwolekr@minetest.net>2015-10-04 02:54:25 -0400
committerkwolekr <kwolekr@minetest.net>2015-10-04 16:27:50 -0400
commit0850d3bb930ac5e2cfd71a58fd49725e4c2a4c96 (patch)
tree15a5f3a2e0e350d6b5ea46caaac104d39d3f5c9b /src/map.h
parent1f9c5a4a7b15ab49e717d81162fe58e4202c0814 (diff)
downloadminetest-0850d3bb930ac5e2cfd71a58fd49725e4c2a4c96.tar.gz
minetest-0850d3bb930ac5e2cfd71a58fd49725e4c2a4c96.tar.bz2
minetest-0850d3bb930ac5e2cfd71a58fd49725e4c2a4c96.zip
Add emerge completion callback mechanism
Major refactor of emerge.cpp and Map::init/finishBlockMake
Diffstat (limited to 'src/map.h')
-rw-r--r--src/map.h8
1 files changed, 4 insertions, 4 deletions
diff --git a/src/map.h b/src/map.h
index 2afd09639..78af8c8d3 100644
--- a/src/map.h
+++ b/src/map.h
@@ -393,21 +393,21 @@ public:
- Check disk (doesn't load blocks)
- Create blank one
*/
- ServerMapSector * createSector(v2s16 p);
+ ServerMapSector *createSector(v2s16 p);
/*
Blocks are generated by using these and makeBlock().
*/
- bool initBlockMake(BlockMakeData *data, v3s16 blockpos);
+ bool initBlockMake(v3s16 blockpos, BlockMakeData *data);
void finishBlockMake(BlockMakeData *data,
- std::map<v3s16, MapBlock*> &changed_blocks);
+ std::map<v3s16, MapBlock*> *changed_blocks);
/*
Get a block from somewhere.
- Memory
- Create blank
*/
- MapBlock * createBlock(v3s16 p);
+ MapBlock *createBlock(v3s16 p);
/*
Forcefully get a block from somewhere.