10 files changed, 39 insertions, 26 deletions

diff --git a/src/Items/ItemBucket.h b/src/Items/ItemBucket.h
index a733bda19..4cdfab0fe 100644
--- a/src/Items/ItemBucket.h
+++ b/src/Items/ItemBucket.h
@@ -49,7 +49,7 @@ public:
 		Vector3i BlockPos;
 		if (!GetBlockFromTrace(a_World, a_Player, BlockPos))
 		{
-			return false; // Nothing in range.
+			return false;  // Nothing in range.
 		}
 
 		if (a_World->GetBlockMeta(BlockPos.x, BlockPos.y, BlockPos.z) != 0)
@@ -160,7 +160,7 @@ public:
 			{
 				if (IsBlockWater(a_BlockType) || IsBlockLava(a_BlockType))
 				{
-					if (a_BlockMeta != 0) // GetBlockFromTrace is called for scooping up fluids; the hit block should be a source
+					if (a_BlockMeta != 0)  // GetBlockFromTrace is called for scooping up fluids; the hit block should be a source
 					{
 						return false;
 					}
diff --git a/src/Items/ItemFishingRod.h b/src/Items/ItemFishingRod.h
index 3b1ad1717..435d8ccf4 100644
--- a/src/Items/ItemFishingRod.h
+++ b/src/Items/ItemFishingRod.h
@@ -17,13 +17,15 @@
 
 
 
-/////////////////////////////////////////////////////////////////////////////////////
+
+
+////////////////////////////////////////////////////////////////////////////////
 // cFloaterCallback
 class cFloaterCallback :
 	public cEntityCallback
 {
 public:
-	cFloaterCallback(void) : 
+	cFloaterCallback(void) :
 		m_CanPickup(false),
 		m_AttachedMobID(-1)
 	{
@@ -49,8 +51,13 @@ protected:
 	Vector3d m_Pos;
 } ;
 
-////////////////////////////////////////////////////////////////////////////
-// cSweepEntityCallback
+
+
+
+
+////////////////////////////////////////////////////////////////////////////////
+// cSweepEntityCallback:
+
 class cSweepEntityCallback :
 	public cEntityCallback
 {
@@ -73,6 +80,8 @@ protected:
 
 
 
+
+
 class cItemFishingRodHandler :
 	public cItemHandler
 {
@@ -106,19 +115,19 @@ public:
 			{
 				cItems Drops;
 				int ItemCategory = a_World->GetTickRandomNumber(99);
-				if (ItemCategory <= 4) // Treasures 5%
+				if (ItemCategory <= 4)  // Treasures 5%
 				{
 					int Treasure = a_World->GetTickRandomNumber(5);
 					switch (Treasure)
 					{
 						case 0:
 						{
-							Drops.Add(cItem(E_ITEM_BOW)); // TODO: Enchantments
+							Drops.Add(cItem(E_ITEM_BOW));  // TODO: Enchantments
 							break;
 						}
 						case 1:
 						{
-							Drops.Add(cItem(E_ITEM_BOOK)); // TODO: Enchanted book
+							Drops.Add(cItem(E_ITEM_BOOK));  // TODO: Enchanted book
 							break;
 						}
 						case 2:
@@ -237,3 +246,7 @@ public:
 		return true;
 	}
 } ;
+
+
+
+
diff --git a/src/Items/ItemHandler.cpp b/src/Items/ItemHandler.cpp
index 85406c826..c261ce0e8 100644
--- a/src/Items/ItemHandler.cpp
+++ b/src/Items/ItemHandler.cpp
@@ -362,7 +362,7 @@ char cItemHandler::GetMaxStackSize(void)
 		return 64;
 	}
 	
-	switch (m_ItemType) //sorted by id
+	switch (m_ItemType)
 	{
 		case E_ITEM_ARROW:                return 64;
 		case E_ITEM_BAKED_POTATO:         return 64;
@@ -568,7 +568,7 @@ bool cItemHandler::EatItem(cPlayer * a_Player, cItem * a_Item)
 			cFastRandom r1;
 			if ((r1.NextInt(100, a_Player->GetUniqueID()) - Info.PoisonChance) <= 0)
 			{
-				a_Player->FoodPoison(600); // Give the player food poisoning for 30 seconds.
+				a_Player->FoodPoison(600);  // Give the player food poisoning for 30 seconds.
 			}
 		}
 
diff --git a/src/Items/ItemHandler.h b/src/Items/ItemHandler.h
index cffca11ab..b33671c2d 100644
--- a/src/Items/ItemHandler.h
+++ b/src/Items/ItemHandler.h
@@ -60,7 +60,7 @@ public:
 	{
 		double Saturation;
 		int    FoodLevel;
-		int    PoisonChance;	 // 0 - 100, in percent. 0 = no chance of poisoning, 100 = sure poisoning
+		int    PoisonChance;	  // 0 - 100, in percent. 0 = no chance of poisoning, 100 = sure poisoning
 
 		FoodInfo(int a_FoodLevel, double a_Saturation, int a_PoisonChance = 0) :
 			Saturation(a_Saturation),
@@ -112,11 +112,11 @@ public:
 	
 protected:
 	int m_ItemType;
-	static cItemHandler *CreateItemHandler(int m_ItemType);
+	static cItemHandler * CreateItemHandler(int m_ItemType);
 
 	static cItemHandler * m_ItemHandler[E_ITEM_LAST + 1];
-	static bool m_HandlerInitialized;	//used to detect if the itemhandlers are initialized
+	static bool m_HandlerInitialized;  // used to detect if the itemhandlers are initialized
 };
 
-//Short function
+// Short function
 inline cItemHandler *ItemHandler(int a_ItemType) { return cItemHandler::GetItemHandler(a_ItemType); }
diff --git a/src/Items/ItemItemFrame.h b/src/Items/ItemItemFrame.h
index b258b4aea..87e20ecf0 100644
--- a/src/Items/ItemItemFrame.h
+++ b/src/Items/ItemItemFrame.h
@@ -27,9 +27,9 @@ public:
 			return false;
 		}
 
-		AddFaceDirection(a_BlockX, a_BlockY, a_BlockZ, a_Dir); // Make sure block that will be occupied is free
+		AddFaceDirection(a_BlockX, a_BlockY, a_BlockZ, a_Dir);  // Make sure block that will be occupied is free
 		BLOCKTYPE Block = a_World->GetBlock(a_BlockX, a_BlockY, a_BlockZ);
-		AddFaceDirection(a_BlockX, a_BlockY, a_BlockZ, a_Dir, true); // We want the clicked block, so go back again
+		AddFaceDirection(a_BlockX, a_BlockY, a_BlockZ, a_Dir, true);  // We want the clicked block, so go back again
 
 		if (Block == E_BLOCK_AIR)
 		{
diff --git a/src/Items/ItemLeaves.h b/src/Items/ItemLeaves.h
index 12cb45d1c..0ed6e5e0e 100644
--- a/src/Items/ItemLeaves.h
+++ b/src/Items/ItemLeaves.h
@@ -31,7 +31,7 @@ public:
 			a_CursorX, a_CursorY, a_CursorZ,
 			a_BlockType, a_BlockMeta
 		);
-		a_BlockMeta = a_BlockMeta | 0x4;  //0x4 bit set means this is a player-placed leaves block, not to be decayed
+		a_BlockMeta = a_BlockMeta | 0x4;  // 0x4 bit set means this is a player-placed leaves block, not to be decayed
 		return res;
 	}
 } ;
diff --git a/src/Items/ItemLilypad.h b/src/Items/ItemLilypad.h
index bc650cdbd..b9d837384 100644
--- a/src/Items/ItemLilypad.h
+++ b/src/Items/ItemLilypad.h
@@ -25,7 +25,7 @@ public:
 
 	virtual bool IsPlaceable(void) override
 	{
-		return false; // Set as not placeable so OnItemUse is called
+		return false;  // Set as not placeable so OnItemUse is called
 	}
 
 
@@ -57,7 +57,7 @@ public:
 			{
 				if (IsBlockWater(a_CBBlockType))
 				{
-					if ((a_CBBlockMeta != 0) || (a_CBEntryFace == BLOCK_FACE_NONE)) // The hit block should be a source. The FACE_NONE check is clicking whilst submerged
+					if ((a_CBBlockMeta != 0) || (a_CBEntryFace == BLOCK_FACE_NONE))  // The hit block should be a source. The FACE_NONE check is clicking whilst submerged
 					{
 						return false;
 					}
diff --git a/src/Items/ItemPainting.h b/src/Items/ItemPainting.h
index e4bb76ebe..a2a77ce21 100644
--- a/src/Items/ItemPainting.h
+++ b/src/Items/ItemPainting.h
@@ -27,9 +27,9 @@ public:
 			return false;
 		}
 
-		AddFaceDirection(a_BlockX, a_BlockY, a_BlockZ, a_Dir); // Make sure block that will be occupied is free
+		AddFaceDirection(a_BlockX, a_BlockY, a_BlockZ, a_Dir);  // Make sure block that will be occupied is free
 		BLOCKTYPE Block = a_World->GetBlock(a_BlockX, a_BlockY, a_BlockZ);
-		AddFaceDirection(a_BlockX, a_BlockY, a_BlockZ, a_Dir, true); // We want the clicked block, so go back again
+		AddFaceDirection(a_BlockX, a_BlockY, a_BlockZ, a_Dir, true);  // We want the clicked block, so go back again
 
 		if (Block == E_BLOCK_AIR)
 		{
@@ -38,14 +38,14 @@ public:
 			// The client uses different values for painting directions and block faces. Our constants are for the block faces, so we convert them here to painting faces
 			switch (a_Dir)
 			{
-				case BLOCK_FACE_ZP: break; // Initialised to zero
+				case BLOCK_FACE_ZP: break;  // Initialised to zero
 				case BLOCK_FACE_ZM: Dir = 2; break;
 				case BLOCK_FACE_XM: Dir = 1; break;
 				case BLOCK_FACE_XP: Dir = 3; break;
 				default: ASSERT(!"Unhandled block face when trying spawn painting!"); return false;
 			}
 
-			static const struct // Define all the possible painting titles
+			static const struct  // Define all the possible painting titles
 			{
 				AString Title;
 			} gPaintingTitlesList[] =
diff --git a/src/Items/ItemRedstoneDust.h b/src/Items/ItemRedstoneDust.h
index 274d905a5..33e386b03 100644
--- a/src/Items/ItemRedstoneDust.h
+++ b/src/Items/ItemRedstoneDust.h
@@ -27,7 +27,7 @@ public:
 		BLOCKTYPE & a_BlockType, NIBBLETYPE & a_BlockMeta
 	) override
 	{
-		if (!cBlockInfo::FullyOccupiesVoxel(a_World->GetBlock(a_BlockX, a_BlockY - 1, a_BlockZ))) // Some solid blocks, such as cocoa beans, are not suitable for dust
+		if (!cBlockInfo::FullyOccupiesVoxel(a_World->GetBlock(a_BlockX, a_BlockY - 1, a_BlockZ)))  // Some solid blocks, such as cocoa beans, are not suitable for dust
 		{
 			return false;
 		}
diff --git a/src/Items/ItemSeeds.h b/src/Items/ItemSeeds.h
index 7283edcee..53f5d51c3 100644
--- a/src/Items/ItemSeeds.h
+++ b/src/Items/ItemSeeds.h
@@ -25,7 +25,7 @@ public:
 
 	virtual bool IsFood(void) override
 	{
-		switch (m_ItemType) // Special cases, both a seed and food
+		switch (m_ItemType)  // Special cases, both a seed and food
 		{
 			case E_ITEM_CARROT:
 			case E_ITEM_POTATO: return true;