1 files changed, 19 insertions, 19 deletions

diff --git a/source/Blocks/BlockTorch.h b/source/Blocks/BlockTorch.h
index e65a973d2..2eb09f3ec 100644
--- a/source/Blocks/BlockTorch.h
+++ b/source/Blocks/BlockTorch.h
@@ -13,17 +13,17 @@ class cBlockTorchHandler :
 	public cBlockHandler

 {

 public:

-	cBlockTorchHandler(BLOCKTYPE a_BlockID)

-		: cBlockHandler(a_BlockID)

+	cBlockTorchHandler(BLOCKTYPE a_BlockType)

+		: cBlockHandler(a_BlockType)

 	{

 	}

 	

 	

-	virtual void PlaceBlock(cWorld * a_World, cPlayer * a_Player, NIBBLETYPE a_BlockMeta, int a_X, int a_Y, int a_Z, char a_Dir) override

+	virtual void PlaceBlock(cWorld * a_World, cPlayer * a_Player, NIBBLETYPE a_BlockMeta, int a_BlockX, int a_BlockY, int a_BlockZ, char a_Dir) override

 	{

-		if (!TorchCanBePlacedAt(a_World, a_X, a_Y, a_Z, a_Dir))

+		if (!TorchCanBePlacedAt(a_World, a_BlockX, a_BlockY, a_BlockZ, a_Dir))

 		{

-			a_Dir = FindSuitableDirection(a_World, a_X, a_Y, a_Z);

+			a_Dir = FindSuitableDirection(a_World, a_BlockX, a_BlockY, a_BlockZ);

 			

 			if (a_Dir == BLOCK_FACE_BOTTOM)

 			{

@@ -31,8 +31,8 @@ public:
 			}

 		}

 

-		a_World->SetBlock(a_X, a_Y, a_Z, m_BlockID, cTorch::DirectionToMetaData(a_Dir));

-		OnPlacedByPlayer(a_World, a_Player, a_X, a_Y, a_Z, a_Dir);

+		a_World->SetBlock(a_BlockX, a_BlockY, a_BlockZ, m_BlockType, cTorch::DirectionToMetaData(a_Dir));

+		OnPlacedByPlayer(a_World, a_Player, a_BlockX, a_BlockY, a_BlockZ, a_Dir);

 	}

 	

 	

@@ -114,7 +114,7 @@ public:
 	}

 	

 	

-	static bool TorchCanBePlacedAt(cWorld * a_World, int a_X, int a_Y, int a_Z, char a_Dir)

+	static bool TorchCanBePlacedAt(cWorld * a_World, int a_BlockX, int a_BlockY, int a_BlockZ, char a_Dir)

 	{

 		// TODO: If placing a torch from below, check all 4 XZ neighbors, place it on that neighbor instead

 		// How to propagate that change up?

@@ -125,18 +125,18 @@ public:
 			return false;

 		}

 

-		AddDirection( a_X, a_Y, a_Z, a_Dir, true );

+		AddDirection( a_BlockX, a_BlockY, a_BlockZ, a_Dir, true );

 

-		return CanBePlacedOn(a_World->GetBlock( a_X, a_Y, a_Z ), a_Dir);

+		return CanBePlacedOn(a_World->GetBlock( a_BlockX, a_BlockY, a_BlockZ ), a_Dir);

 	}

 	

 	

 	/// Finds a suitable Direction for the Torch. Returns BLOCK_FACE_BOTTOM on failure

-	static char FindSuitableDirection(cWorld * a_World, int a_X, int a_Y, int a_Z)

+	static char FindSuitableDirection(cWorld * a_World, int a_BlockX, int a_BlockY, int a_BlockZ)

 	{

 		for (int i = 1; i <= 5; i++)

 		{

-			if (TorchCanBePlacedAt(a_World, a_X, a_Y, a_Z, i))

+			if (TorchCanBePlacedAt(a_World, a_BlockX, a_BlockY, a_BlockZ, i))

 			{

 				return i;

 			}

@@ -145,26 +145,26 @@ public:
 	}

 

 

-	virtual bool CanBePlacedAt(cWorld * a_World, int a_X, int a_Y, int a_Z, char a_Dir) override

+	virtual bool CanBePlacedAt(cWorld * a_World, int a_BlockX, int a_BlockY, int a_BlockZ, char a_Dir) override

 	{

-		if(TorchCanBePlacedAt(a_World, a_X, a_Y, a_Z, a_Dir))

+		if(TorchCanBePlacedAt(a_World, a_BlockX, a_BlockY, a_BlockZ, a_Dir))

 			return true;

 

-		return FindSuitableDirection(a_World, a_X, a_Y, a_Z) != BLOCK_FACE_BOTTOM;

+		return FindSuitableDirection(a_World, a_BlockX, a_BlockY, a_BlockZ) != BLOCK_FACE_BOTTOM;

 	}

 

 

-	virtual bool CanBeAt(cWorld * a_World, int a_X, int a_Y, int a_Z) override

+	virtual bool CanBeAt(cWorld * a_World, int a_BlockX, int a_BlockY, int a_BlockZ) override

 	{

-		char Dir = cTorch::MetaDataToDirection(a_World->GetBlockMeta( a_X, a_Y, a_Z));

-		return TorchCanBePlacedAt(a_World, a_X, a_Y, a_Z, Dir);

+		char Dir = cTorch::MetaDataToDirection(a_World->GetBlockMeta( a_BlockX, a_BlockY, a_BlockZ));

+		return TorchCanBePlacedAt(a_World, a_BlockX, a_BlockY, a_BlockZ, Dir);

 	}

 

 

 	virtual void ConvertToPickups(cItems & a_Pickups, NIBBLETYPE a_BlockMeta) override

 	{

 		// Always drop meta = 0

-		a_Pickups.push_back(cItem(m_BlockID, 1, 0));

+		a_Pickups.push_back(cItem(m_BlockType, 1, 0));

 	}