From 0850d3bb930ac5e2cfd71a58fd49725e4c2a4c96 Mon Sep 17 00:00:00 2001
From: kwolekr <kwolekr@minetest.net>
Date: Sun, 4 Oct 2015 02:54:25 -0400
Subject: Add emerge completion callback mechanism

Major refactor of emerge.cpp and Map::init/finishBlockMake
---
 src/map.h | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

(limited to 'src/map.h')

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.
-- 
cgit v1.2.3