X-Git-Url: https://git.lizzy.rs/?a=blobdiff_plain;f=src%2Fmap.h;h=b28f34db30c75d7103d9b9ec9899fc7781da3451;hb=0abb3e89fa6298041faa7e46d437e5a81f71cdd3;hp=4d9847063066075eb575c8a6c929bfd80b63289c;hpb=6e4d8de10442eecf71ba36ad015872a135a53338;p=minetest.git

diff --git a/src/map.h b/src/map.h
index 4d9847063..b28f34db3 100644
--- a/src/map.h
+++ b/src/map.h
@@ -123,7 +123,7 @@ class Map /*: public NodeContainer*/
 {
 public:
 
-	Map(std::ostream &dout, IGameDef *gamedef);
+	Map(IGameDef *gamedef);
 	virtual ~Map();
 	DISABLE_CLASS_COPY(Map);
 
@@ -149,8 +149,6 @@ class Map /*: public NodeContainer*/
 	MapSector * getSectorNoGenerateNoLock(v2s16 p2d);
 	// Same as the above (there exists no lock anymore)
 	MapSector * getSectorNoGenerate(v2s16 p2d);
-	// Gets an existing sector or creates an empty one
-	//MapSector * getSectorCreate(v2s16 p2d);
 
 	/*
 		This is overloaded by ClientMap and ServerMap to allow
@@ -268,11 +266,6 @@ class Map /*: public NodeContainer*/
 	void setNodeTimer(const NodeTimer &t);
 	void removeNodeTimer(v3s16 p);
 
-	/*
-		Misc.
-	*/
-	std::map<v2s16, MapSector*> *getSectorsPtr(){return &m_sectors;}
-
 	/*
 		Variables
 	*/
@@ -283,8 +276,6 @@ class Map /*: public NodeContainer*/
 protected:
 	friend class LuaVoxelManip;
 
-	std::ostream &m_dout; // A bit deprecated, could be removed
-
 	IGameDef *m_gamedef;
 
 	std::set<MapEventReceiver*> m_event_receivers;
@@ -374,15 +365,6 @@ class ServerMap : public Map
 	*/
 	MapBlock *getBlockOrEmerge(v3s16 p3d);
 
-	// Helper for placing objects on ground level
-	s16 findGroundLevel(v2s16 p2d);
-
-	/*
-		Misc. helper functions for fiddling with directory and file
-		names when saving
-	*/
-	void createDirs(const std::string &path);
-
 	/*
 		Database functions
 	*/
@@ -414,7 +396,6 @@ class ServerMap : public Map
 	bool isSavingEnabled(){ return m_map_saving_enabled; }
 
 	u64 getSeed();
-	s16 getWaterLevel();
 
 	/*!
 	 * Fixes lighting in one map block.