Merge branch 'master' into master

1 files changed, 11 insertions, 5 deletions

diff --git a/src/mapsector.h b/src/mapsector.h
index ff96be498..dede364f6 100644
--- a/src/mapsector.h
+++ b/src/mapsector.h
@@ -39,16 +39,20 @@ class IGameDef;
 class MapSector
 {
 public:
+
 	MapSector(Map *parent, v2s16 pos, IGameDef *gamedef);
 	virtual ~MapSector();
 
 	void deleteBlocks();
 
-	v2s16 getPos() { return m_pos; }
+	v2s16 getPos()
+	{
+		return m_pos;
+	}
 
-	MapBlock *getBlockNoCreateNoEx(s16 y);
-	MapBlock *createBlankBlockNoInsert(s16 y);
-	MapBlock *createBlankBlock(s16 y);
+	MapBlock * getBlockNoCreateNoEx(s16 y);
+	MapBlock * createBlankBlockNoInsert(s16 y);
+	MapBlock * createBlankBlock(s16 y);
 
 	void insertBlock(MapBlock *block);
 
@@ -59,8 +63,9 @@ public:
 	bool empty() const { return m_blocks.empty(); }
 
 protected:
+
 	// The pile of MapBlocks
-	std::unordered_map<s16, MapBlock *> m_blocks;
+	std::unordered_map<s16, MapBlock*> m_blocks;
 
 	Map *m_parent;
 	// Position on parent (in MapBlock widths)
@@ -77,4 +82,5 @@ protected:
 		Private methods
 	*/
 	MapBlock *getBlockBuffered(s16 y);
+
 };