X-Git-Url: https://git.lizzy.rs/?a=blobdiff_plain;f=src%2Fmap.h;h=f5c7671aee5c2eced040e31674e97b7744e28a84;hb=392e80e3f13c977b5499eb424fa7d65085fb08f5;hp=377e75ed0c9485de2f562bb9e2ffcf6cc18eb751;hpb=8f7785771b9e02b1a1daf7a252550d78ea93053d;p=dragonfireclient.git

diff --git a/src/map.h b/src/map.h
index 377e75ed0..f5c7671ae 100644
--- a/src/map.h
+++ b/src/map.h
@@ -17,8 +17,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 */
 
-#ifndef MAP_HEADER
-#define MAP_HEADER
+#pragma once
 
 #include <iostream>
 #include <sstream>
@@ -34,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;
@@ -78,7 +78,7 @@ struct MapEditEvent
 	std::set<v3s16> modified_blocks;
 	u16 already_known_by_peer = 0;
 
-	MapEditEvent() {}
+	MapEditEvent() = default;
 
 	MapEditEvent * clone()
 	{
@@ -108,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);
@@ -172,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);
@@ -184,7 +178,7 @@ class Map /*: public NodeContainer*/
 	virtual MapBlock * emergeBlock(v3s16 p, bool create_blank=true)
 	{ return getBlockNoCreateNoEx(p); }
 
-	inline INodeDefManager * getNodeDefManager() { return m_nodedef; }
+	inline const NodeDefManager * getNodeDefManager() { return m_nodedef; }
 
 	// Returns InvalidPositionException if not found
 	bool isNodeUnderground(v3s16 p);
@@ -216,18 +210,9 @@ class Map /*: public NodeContainer*/
 	bool addNodeWithEvent(v3s16 p, MapNode n, bool remove_metadata = true);
 	bool removeNodeWithEvent(v3s16 p);
 
-	/*
-		Takes the blocks at the edges into account
-	*/
-	bool getDayNightDiff(v3s16 blockpos);
-
-	//core::aabbox3d<s16> getDisplayedBlockArea();
-
-	//bool updateChangedVisibleArea();
-
 	// 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"); }
 
@@ -304,7 +289,6 @@ class Map /*: public NodeContainer*/
 	*/
 
 	void transforming_liquid_add(v3s16 p);
-	s32 transforming_liquid_size();
 
 	bool isBlockOccluded(MapBlock *block, v3s16 cam_pos_nodes);
 protected:
@@ -326,7 +310,7 @@ class Map /*: public NodeContainer*/
 	UniqueQueue<v3s16> m_transforming_liquid;
 
 	// This stores the properties of the nodes on the map.
-	INodeDefManager *m_nodedef;
+	const NodeDefManager *m_nodedef;
 
 	bool isOccluded(v3s16 p0, v3s16 p1, float step, float stepfac,
 			float start_off, float end_off, u32 needed_count);
@@ -364,9 +348,7 @@ class ServerMap : public Map
 		- Check disk (doesn't load blocks)
 		- Create blank one
 	*/
-	ServerMapSector *createSector(v2s16 p);
-
-	bool saoPositionOverLimit(const v3f &p);
+	MapSector *createSector(v2s16 p);
 
 	/*
 		Blocks are generated by using these and makeBlock().
@@ -433,18 +415,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.
@@ -509,7 +479,7 @@ class MMVManip : public VoxelManipulator
 {
 public:
 	MMVManip(Map *map);
-	virtual ~MMVManip();
+	virtual ~MMVManip() = default;
 
 	virtual void clear()
 	{
@@ -534,5 +504,3 @@ class MMVManip : public VoxelManipulator
 	*/
 	std::map<v3s16, u8> m_loaded_blocks;
 };
-
-#endif