X-Git-Url: https://git.lizzy.rs/?a=blobdiff_plain;ds=sidebyside;f=src%2Fmap.h;h=cd85e1827ee99bf3830d6fd797ab35045ce23356;hb=d6050bee5187d0d456e9d95406fc74ba163ea3aa;hp=4dd2b7e300ad55334f6ec4e68006383e99468a58;hpb=921151d97a2fb2238ab514324fb95e2732248b96;p=minetest.git

diff --git a/src/map.h b/src/map.h
index 4dd2b7e30..cd85e1827 100644
--- a/src/map.h
+++ b/src/map.h
@@ -33,6 +33,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 #include "util/container.h"
 #include "nodetimer.h"
 #include "map_settings_manager.h"
+#include "debug.h"
 
 class Settings;
 class MapDatabase;
@@ -77,7 +78,7 @@ struct MapEditEvent
 	std::set<v3s16> modified_blocks;
 	u16 already_known_by_peer = 0;
 
-	MapEditEvent() {}
+	MapEditEvent() = default;
 
 	MapEditEvent * clone()
 	{
@@ -107,11 +108,7 @@ struct MapEditEvent
 		case MEET_OTHER:
 		{
 			VoxelArea a;
-			for(std::set<v3s16>::iterator
-					i = modified_blocks.begin();
-					i != modified_blocks.end(); ++i)
-			{
-				v3s16 p = *i;
+			for (v3s16 p : modified_blocks) {
 				v3s16 np1 = p*MAP_BLOCKSIZE;
 				v3s16 np2 = np1 + v3s16(1,1,1)*MAP_BLOCKSIZE - v3s16(1,1,1);
 				a.addPoint(np1);
@@ -171,8 +168,6 @@ class Map /*: public NodeContainer*/
 		their differing fetch methods.
 	*/
 	virtual MapSector * emergeSector(v2s16 p){ return NULL; }
-	virtual MapSector * emergeSector(v2s16 p,
-			std::map<v3s16, MapBlock*> &changed_blocks){ return NULL; }
 
 	// Returns InvalidPositionException if not found
 	MapBlock * getBlockNoCreate(v3s16 p);
@@ -216,8 +211,8 @@ class Map /*: public NodeContainer*/
 	bool removeNodeWithEvent(v3s16 p);
 
 	// Call these before and after saving of many blocks
-	virtual void beginSave() { return; }
-	virtual void endSave() { return; }
+	virtual void beginSave() {}
+	virtual void endSave() {}
 
 	virtual void save(ModifiedState save_level) { FATAL_ERROR("FIXME"); }
 
@@ -354,7 +349,7 @@ class ServerMap : public Map
 		- Check disk (doesn't load blocks)
 		- Create blank one
 	*/
-	ServerMapSector *createSector(v2s16 p);
+	MapSector *createSector(v2s16 p);
 
 	bool saoPositionOverLimit(const v3f &p);
 
@@ -423,18 +418,6 @@ class ServerMap : public Map
 
 	MapgenParams *getMapgenParams();
 
-	/*void saveChunkMeta();
-	void loadChunkMeta();*/
-
-	// The sector mutex should be locked when calling most of these
-
-	// This only saves sector-specific data such as the heightmap
-	// (no MapBlocks)
-	// DEPRECATED? Sectors have no metadata anymore.
-	void saveSectorMeta(ServerMapSector *sector);
-	MapSector* loadSectorMeta(std::string dirname, bool save_after_load);
-	bool loadSectorMeta(v2s16 p2d);
-
 	bool saveBlock(MapBlock *block);
 	static bool saveBlock(MapBlock *block, MapDatabase *db);
 	// This will generate a sector with getSector if not found.
@@ -499,7 +482,7 @@ class MMVManip : public VoxelManipulator
 {
 public:
 	MMVManip(Map *map);
-	virtual ~MMVManip();
+	virtual ~MMVManip() = default;
 
 	virtual void clear()
 	{