X-Git-Url: https://git.lizzy.rs/?a=blobdiff_plain;ds=sidebyside;f=src%2Fmap.h;h=ada59a4d525114b54ce5e020388ef6775589aba9;hb=807a0d313ba667356ee8af8ef5ae82b6c4881d15;hp=cb649addd009253c9f2c223326b910b2a47ff55f;hpb=71418639d3e81a0c4f03633042f9c3472572a87e;p=minetest.git

diff --git a/src/map.h b/src/map.h
index cb649addd..ada59a4d5 100644
--- a/src/map.h
+++ b/src/map.h
@@ -28,9 +28,10 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 
 #include "common_irrlicht.h"
 #include "mapnode.h"
-#include "mapblock_nodemod.h"
 #include "constants.h"
 #include "voxel.h"
+#include "utility.h" // Needed for UniqueQueue, a member of Map
+#include "modifiedstate.h"
 
 extern "C" {
 	#include "sqlite3.h"
@@ -41,6 +42,7 @@ class ServerMapSector;
 class ClientMapSector;
 class MapBlock;
 class NodeMetadata;
+class IGameDef;
 
 namespace mapgen{
 	struct BlockMakeData;
@@ -109,7 +111,7 @@ class Map /*: public NodeContainer*/
 {
 public:
 
-	Map(std::ostream &dout);
+	Map(std::ostream &dout, IGameDef *gamedef);
 	virtual ~Map();
 
 	/*virtual u16 nodeContainerId() const
@@ -157,6 +159,10 @@ class Map /*: public NodeContainer*/
 	// Returns NULL if not found
 	MapBlock * getBlockNoCreateNoEx(v3s16 p);
 	
+	/* Server overrides */
+	virtual MapBlock * emergeBlock(v3s16 p, bool allow_generate=true)
+	{ return getBlockNoCreateNoEx(p); }
+
 	// Returns InvalidPositionException if not found
 	bool isNodeUnderground(v3s16 p);
 	
@@ -230,7 +236,7 @@ class Map /*: public NodeContainer*/
 	virtual void beginSave() {return;};
 	virtual void endSave() {return;};
 	
-	virtual void save(bool only_changed){assert(0);};
+	virtual void save(ModifiedState save_level){assert(0);};
 	
 	// Server implements this.
 	// Client leaves it as no-op.
@@ -285,7 +291,9 @@ class Map /*: public NodeContainer*/
 	
 protected:
 
-	std::ostream &m_dout;
+	std::ostream &m_dout; // A bit deprecated, could be removed
+
+	IGameDef *m_gamedef;
 
 	core::map<MapEventReceiver*, bool> m_event_receivers;
 	
@@ -311,7 +319,7 @@ class ServerMap : public Map
 	/*
 		savedir: directory to which map data should be saved
 	*/
-	ServerMap(std::string savedir);
+	ServerMap(std::string savedir, IGameDef *gamedef);
 	~ServerMap();
 
 	s32 mapType() const
@@ -379,6 +387,7 @@ class ServerMap : public Map
 	void verifyDatabase();
 	// Get an integer suitable for a block
 	static sqlite3_int64 getBlockAsInteger(const v3s16 pos);
+	static v3s16 getIntegerAsBlock(sqlite3_int64 i);
 
 	// Returns true if the database file does not exist
 	bool loadFromFolders();
@@ -387,9 +396,11 @@ class ServerMap : public Map
 	void beginSave();
 	void endSave();
 
-	void save(bool only_changed);
+	void save(ModifiedState save_level);
 	//void loadAll();
 	
+	void listAllLoadableBlocks(core::list<v3s16> &dst);
+	
 	// Saves map seed and possibly other stuff
 	void saveMapMeta();
 	void loadMapMeta();
@@ -428,9 +439,9 @@ class ServerMap : public Map
 	u64 getSeed(){ return m_seed; }
 
 private:
-	// Seed used for all kinds of randomness
+	// Seed used for all kinds of randomness in generation
 	u64 m_seed;
-
+	
 	std::string m_savedir;
 	bool m_map_saving_enabled;
 
@@ -454,6 +465,7 @@ class ServerMap : public Map
 	sqlite3 *m_database;
 	sqlite3_stmt *m_database_read;
 	sqlite3_stmt *m_database_write;
+	sqlite3_stmt *m_database_list;
 };
 
 /*
@@ -488,6 +500,7 @@ struct MapDrawControl
 };
 
 class Client;
+class ITextureSource;
 
 /*
 	ClientMap
@@ -500,6 +513,7 @@ class ClientMap : public Map, public scene::ISceneNode
 public:
 	ClientMap(
 			Client *client,
+			IGameDef *gamedef,
 			MapDrawControl &control,
 			scene::ISceneNode* parent,
 			scene::ISceneManager* mgr,
@@ -555,33 +569,6 @@ class ClientMap : public Map, public scene::ISceneNode
 
 	void renderPostFx();
 
-	/*
-		Methods for setting temporary modifications to nodes for
-		drawing.
-
-		Returns true if something changed.
-		
-		All blocks whose mesh could have been changed are inserted
-		to affected_blocks.
-	*/
-	bool setTempMod(v3s16 p, NodeMod mod,
-			core::map<v3s16, MapBlock*> *affected_blocks=NULL);
-	bool clearTempMod(v3s16 p,
-			core::map<v3s16, MapBlock*> *affected_blocks=NULL);
-	// Efficient implementation needs a cache of TempMods
-	//void clearTempMods();
-
-	void expireMeshes(bool only_daynight_diffed);
-	
-	/*
-		Update the faces of the given block and blocks on the
-		leading edge.
-	*/
-	void updateMeshes(v3s16 blockpos, u32 daynight_ratio);
-	
-	// Update meshes that touch the node
-	//void updateNodeMeshes(v3s16 nodepos, u32 daynight_ratio);
-
 	// For debug printing
 	virtual void PrintInfo(std::ostream &out);