From 487f9a2aa9b5497495cef1ac3b9c7a603e69f862 Mon Sep 17 00:00:00 2001
From: Mattes D <github@xoft.cz>
Date: Tue, 21 Apr 2020 22:19:22 +0200
Subject: Vector3 in Handlers (#4680)

Refactored all cBlockHandler and cItemHandler descendants to use Vector3.
---
 src/Items/ItemPainting.h | 125 ++++++++++++++++++++++++++---------------------
 1 file changed, 68 insertions(+), 57 deletions(-)

(limited to 'src/Items/ItemPainting.h')

diff --git a/src/Items/ItemPainting.h b/src/Items/ItemPainting.h
index f9fa0a601..cc1d02ac4 100644
--- a/src/Items/ItemPainting.h
+++ b/src/Items/ItemPainting.h
@@ -10,82 +10,93 @@
 
 
 
-class cItemPaintingHandler :
+class cItemPaintingHandler:
 	public cItemHandler
 {
+	using Super = cItemHandler;
+
 public:
-	cItemPaintingHandler(int a_ItemType)
-		: cItemHandler(a_ItemType)
+
+	cItemPaintingHandler(int a_ItemType):
+		Super(a_ItemType)
 	{
 	}
 
 
 
+
+
 	virtual bool OnItemUse(
-		cWorld * a_World, cPlayer * a_Player, cBlockPluginInterface & a_PluginInterface, const cItem & a_Item,
-		int a_BlockX, int a_BlockY, int a_BlockZ, eBlockFace a_BlockFace
+		cWorld * a_World,
+		cPlayer * a_Player,
+		cBlockPluginInterface & a_PluginInterface,
+		const cItem & a_HeldItem,
+		const Vector3i a_ClickedBlockPos,
+		eBlockFace a_ClickedBlockFace
 	) override
 	{
-		if ((a_BlockFace == BLOCK_FACE_NONE) || (a_BlockFace == BLOCK_FACE_YM) || (a_BlockFace == BLOCK_FACE_YP))
+		// Paintings can't be flatly placed:
+		if (
+			(a_ClickedBlockFace == BLOCK_FACE_NONE) ||
+			(a_ClickedBlockFace == BLOCK_FACE_YM) ||
+			(a_ClickedBlockFace == BLOCK_FACE_YP)
+		)
 		{
-			// Paintings can't be flatly placed
 			return false;
 		}
 
-		AddFaceDirection(a_BlockX, a_BlockY, a_BlockZ, a_BlockFace);  // Make sure block that will be occupied is free
-		BLOCKTYPE Block = a_World->GetBlock(a_BlockX, a_BlockY, a_BlockZ);
+		// Make sure block that will be occupied is free:
+		auto PlacePos = AddFaceDirection(a_ClickedBlockPos, a_ClickedBlockFace);
+		BLOCKTYPE PlaceBlockType = a_World->GetBlock(PlacePos);
+		if (PlaceBlockType != E_BLOCK_AIR)
+		{
+			return false;
+		}
 
-		if (Block == E_BLOCK_AIR)
+		// Define all the possible painting titles
+		static const AString gPaintingTitlesList[] =
+		{
+			{ "Kebab" },
+			{ "Aztec" },
+			{ "Alban" },
+			{ "Aztec2" },
+			{ "Bomb" },
+			{ "Plant" },
+			{ "Wasteland" },
+			{ "Wanderer" },
+			{ "Graham" },
+			{ "Pool" },
+			{ "Courbet" },
+			{ "Sunset" },
+			{ "Sea" },
+			{ "Creebet" },
+			{ "Match" },
+			{ "Bust" },
+			{ "Stage" },
+			{ "Void" },
+			{ "SkullAndRoses" },
+			{ "Wither" },
+			{ "Fighters" },
+			{ "Skeleton" },
+			{ "DonkeyKong" },
+			{ "Pointer" },
+			{ "Pigscene" },
+			{ "BurningSkull" }
+		};
+
+		auto PaintingTitle = gPaintingTitlesList[a_World->GetTickRandomNumber(ARRAYCOUNT(gPaintingTitlesList) - 1)];
+		auto Painting = cpp14::make_unique<cPainting>(PaintingTitle, a_ClickedBlockFace, PlacePos);
+		auto PaintingPtr = Painting.get();
+		if (!PaintingPtr->Initialize(std::move(Painting), *a_World))
 		{
-			static const struct  // Define all the possible painting titles
-			{
-				AString Title;
-			} gPaintingTitlesList[] =
-			{
-				{ "Kebab" },
-				{ "Aztec" },
-				{ "Alban" },
-				{ "Aztec2" },
-				{ "Bomb" },
-				{ "Plant" },
-				{ "Wasteland" },
-				{ "Wanderer" },
-				{ "Graham" },
-				{ "Pool" },
-				{ "Courbet" },
-				{ "Sunset" },
-				{ "Sea" },
-				{ "Creebet" },
-				{ "Match" },
-				{ "Bust" },
-				{ "Stage" },
-				{ "Void" },
-				{ "SkullAndRoses" },
-				{ "Wither" },
-				{ "Fighters" },
-				{ "Skeleton" },
-				{ "DonkeyKong" },
-				{ "Pointer" },
-				{ "Pigscene" },
-				{ "BurningSkull" }
-			};
-
-			auto Painting = cpp14::make_unique<cPainting>(gPaintingTitlesList[a_World->GetTickRandomNumber(ARRAYCOUNT(gPaintingTitlesList) - 1)].Title, a_BlockFace, Vector3i{a_BlockX, a_BlockY, a_BlockZ});
-			auto PaintingPtr = Painting.get();
-			if (!PaintingPtr->Initialize(std::move(Painting), *a_World))
-			{
-				return false;
-			}
-
-			if (!a_Player->IsGameModeCreative())
-			{
-				a_Player->GetInventory().RemoveOneEquippedItem();
-			}
-
-			return true;
+			return false;
+		}
 
+		if (!a_Player->IsGameModeCreative())
+		{
+			a_Player->GetInventory().RemoveOneEquippedItem();
 		}
-		return false;
+		return true;
 	}
 };
 
-- 
cgit v1.2.3