X-Git-Url: https://git.lizzy.rs/?a=blobdiff_plain;f=src%2Fmap.h;h=da55fb432234f42b119262ddaa3d6e35dc3e81df;hb=e8fd1ce62331146fae0e98ce4a94d3720f308abf;hp=6b4942b4d319c94203bf5bd8c8b0a672c12238da;hpb=3face01a202040e4feff3b0936b4aa89c051c98d;p=dragonfireclient.git

diff --git a/src/map.h b/src/map.h
index 6b4942b4d..da55fb432 100644
--- a/src/map.h
+++ b/src/map.h
@@ -63,8 +63,7 @@ enum MapEditEventType{
 	MEET_REMOVENODE,
 	// Node swapped (changed without metadata change)
 	MEET_SWAPNODE,
-	// Node metadata of block changed (not knowing which node exactly)
-	// p stores block coordinate
+	// Node metadata changed
 	MEET_BLOCK_NODE_METADATA_CHANGED,
 	// Anything else (modified_blocks are set unsent)
 	MEET_OTHER
@@ -76,21 +75,11 @@ struct MapEditEvent
 	v3s16 p;
 	MapNode n = CONTENT_AIR;
 	std::set<v3s16> modified_blocks;
-	u16 already_known_by_peer = 0;
+	bool is_private_change = false;
 
 	MapEditEvent() = default;
 
-	MapEditEvent * clone()
-	{
-		MapEditEvent *event = new MapEditEvent();
-		event->type = type;
-		event->p = p;
-		event->n = n;
-		event->modified_blocks = modified_blocks;
-		return event;
-	}
-
-	VoxelArea getArea()
+	VoxelArea getArea() const
 	{
 		switch(type){
 		case MEET_ADDNODE:
@@ -125,7 +114,7 @@ class MapEventReceiver
 {
 public:
 	// event shall be deleted by caller after the call.
-	virtual void onMapEditEvent(MapEditEvent *event) = 0;
+	virtual void onMapEditEvent(const MapEditEvent &event) = 0;
 };
 
 class Map /*: public NodeContainer*/
@@ -152,13 +141,11 @@ class Map /*: public NodeContainer*/
 	void addEventReceiver(MapEventReceiver *event_receiver);
 	void removeEventReceiver(MapEventReceiver *event_receiver);
 	// event shall be deleted by caller after the call.
-	void dispatchEvent(MapEditEvent *event);
+	void dispatchEvent(const MapEditEvent &event);
 
 	// On failure returns NULL
-	MapSector * getSectorNoGenerateNoExNoLock(v2s16 p2d);
+	MapSector * getSectorNoGenerateNoLock(v2s16 p2d);
 	// Same as the above (there exists no lock anymore)
-	MapSector * getSectorNoGenerateNoEx(v2s16 p2d);
-	// On failure throws InvalidPositionException
 	MapSector * getSectorNoGenerate(v2s16 p2d);
 	// Gets an existing sector or creates an empty one
 	//MapSector * getSectorCreate(v2s16 p2d);
@@ -191,7 +178,7 @@ class Map /*: public NodeContainer*/
 	// Returns a CONTENT_IGNORE node if not found
 	// If is_valid_position is not NULL then this will be set to true if the
 	// position is valid, otherwise false
-	MapNode getNodeNoEx(v3s16 p, bool *is_valid_position = NULL);
+	MapNode getNode(v3s16 p, bool *is_valid_position = NULL);
 
 	/*
 		These handle lighting but not faces.
@@ -289,7 +276,6 @@ class Map /*: public NodeContainer*/
 	*/
 
 	void transforming_liquid_add(v3s16 p);
-	s32 transforming_liquid_size();
 
 	bool isBlockOccluded(MapBlock *block, v3s16 cam_pos_nodes);
 protected:
@@ -313,8 +299,11 @@ class Map /*: public NodeContainer*/
 	// This stores the properties of the nodes on the map.
 	const NodeDefManager *m_nodedef;
 
-	bool isOccluded(v3s16 p0, v3s16 p1, float step, float stepfac,
-			float start_off, float end_off, u32 needed_count);
+	bool determineAdditionalOcclusionCheck(const v3s16 &pos_camera,
+		const core::aabbox3d<s16> &block_bounds, v3s16 &check);
+	bool isOccluded(const v3s16 &pos_camera, const v3s16 &pos_target,
+		float step, float stepfac, float start_offset, float end_offset,
+		u32 needed_count);
 
 private:
 	f32 m_transforming_liquid_loop_count_multiplier = 1.0f;
@@ -351,8 +340,6 @@ class ServerMap : public Map
 	*/
 	MapSector *createSector(v2s16 p);
 
-	bool saoPositionOverLimit(const v3f &p);
-
 	/*
 		Blocks are generated by using these and makeBlock().
 	*/
@@ -392,22 +379,13 @@ class ServerMap : public Map
 		Misc. helper functions for fiddling with directory and file
 		names when saving
 	*/
-	void createDirs(std::string path);
-	// returns something like "map/sectors/xxxxxxxx"
-	std::string getSectorDir(v2s16 pos, int layout = 2);
-	// dirname: final directory name
-	v2s16 getSectorPos(const std::string &dirname);
-	v3s16 getBlockPos(const std::string &sectordir, const std::string &blockfile);
-	static std::string getBlockFilename(v3s16 p);
+	void createDirs(const std::string &path);
 
 	/*
 		Database functions
 	*/
 	static MapDatabase *createDatabase(const std::string &name, const std::string &savedir, Settings &conf);
 
-	// Returns true if the database file does not exist
-	bool loadFromFolders();
-
 	// Call these before and after saving of blocks
 	void beginSave();
 	void endSave();
@@ -420,9 +398,6 @@ class ServerMap : public Map
 
 	bool saveBlock(MapBlock *block);
 	static bool saveBlock(MapBlock *block, MapDatabase *db);
-	// This will generate a sector with getSector if not found.
-	void loadBlock(const std::string &sectordir, const std::string &blockfile,
-			MapSector *sector, bool save_after_load=false);
 	MapBlock* loadBlock(v3s16 p);
 	// Database version
 	void loadBlock(std::string *blob, v3s16 p3d, MapSector *sector, bool save_after_load=false);
@@ -472,6 +447,7 @@ class ServerMap : public Map
 	*/
 	bool m_map_metadata_changed = true;
 	MapDatabase *dbase = nullptr;
+	MapDatabase *dbase_ro = nullptr;
 };