X-Git-Url: https://git.librecmc.org/?a=blobdiff_plain;f=src%2Fmapsector.h;h=dede364f6fe1f41a046210c36d336abf69ba25f2;hb=3face01a202040e4feff3b0936b4aa89c051c98d;hp=88fc76b571974a1e6cce5d6d1ef7da2861da15ea;hpb=6d0ea26c2d62c3774ff384cf1bfc2a3372b49a3b;p=oweals%2Fminetest.git

diff --git a/src/mapsector.h b/src/mapsector.h
index 88fc76b57..dede364f6 100644
--- a/src/mapsector.h
+++ b/src/mapsector.h
@@ -17,15 +17,15 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 */
 
-#ifndef MAPSECTOR_HEADER
-#define MAPSECTOR_HEADER
+#pragma once
 
-#include <jmutex.h>
-#include "irrlichttypes_bloated.h"
-#include "exceptions.h"
+#include "irrlichttypes.h"
+#include "irr_v2d.h"
+#include "mapblock.h"
 #include <ostream>
+#include <map>
+#include <vector>
 
-class MapBlock;
 class Map;
 class IGameDef;
 
@@ -39,12 +39,10 @@ class IGameDef;
 class MapSector
 {
 public:
-	
+
 	MapSector(Map *parent, v2s16 pos, IGameDef *gamedef);
 	virtual ~MapSector();
 
-	virtual u32 getId() const = 0;
-
 	void deleteBlocks();
 
 	v2s16 getPos()
@@ -57,81 +55,32 @@ public:
 	MapBlock * createBlankBlock(s16 y);
 
 	void insertBlock(MapBlock *block);
-	
+
 	void deleteBlock(MapBlock *block);
-	
-	void getBlocks(core::list<MapBlock*> &dest);
-	
-	// Always false at the moment, because sector contains no metadata.
-	bool differs_from_disk;
+
+	void getBlocks(MapBlockVect &dest);
+
+	bool empty() const { return m_blocks.empty(); }
 
 protected:
-	
+
 	// The pile of MapBlocks
-	core::map<s16, MapBlock*> m_blocks;
+	std::unordered_map<s16, MapBlock*> m_blocks;
 
 	Map *m_parent;
 	// Position on parent (in MapBlock widths)
 	v2s16 m_pos;
 
 	IGameDef *m_gamedef;
- 	
+
 	// Last-used block is cached here for quicker access.
-	// Be sure to set this to NULL when the cached block is deleted 
-	MapBlock *m_block_cache;
+	// Be sure to set this to nullptr when the cached block is deleted
+	MapBlock *m_block_cache = nullptr;
 	s16 m_block_cache_y;
-	
+
 	/*
 		Private methods
 	*/
 	MapBlock *getBlockBuffered(s16 y);
 
 };
-
-class ServerMapSector : public MapSector
-{
-public:
-	ServerMapSector(Map *parent, v2s16 pos, IGameDef *gamedef);
-	~ServerMapSector();
-	
-	u32 getId() const
-	{
-		return MAPSECTOR_SERVER;
-	}
-
-	/*
-		These functions handle metadata.
-		They do not handle blocks.
-	*/
-
-	void serialize(std::ostream &os, u8 version);
-	
-	static ServerMapSector* deSerialize(
-			std::istream &is,
-			Map *parent,
-			v2s16 p2d,
-			core::map<v2s16, MapSector*> & sectors,
-			IGameDef *gamedef
-		);
-		
-private:
-};
-
-#ifndef SERVER
-class ClientMapSector : public MapSector
-{
-public:
-	ClientMapSector(Map *parent, v2s16 pos, IGameDef *gamedef);
-	~ClientMapSector();
-	
-	u32 getId() const
-	{
-		return MAPSECTOR_CLIENT;
-	}
-
-private:
-};
-#endif
-	
-#endif
-