BlockHandler initialisation is a constant expression (#4891)

* BlockHandler initialisation is a constant expression If we can't make it all namespaces, this is the next best I guess. + Tag handlers constexpr, const as needed + Inherit constructors * Privatise handler functions * More constexpr Co-authored-by: Alexander Harkness <me@bearbin.net>
2020-09-20 13:50:52 +00:00
parent 6a0669fb98
commit 68cced73af
115 changed files with 1773 additions and 2242 deletions
@@ -16,113 +16,31 @@ class cBlockComparatorHandler :

 public:

-	cBlockComparatorHandler(BLOCKTYPE a_BlockType):
-		Super(a_BlockType)
-	{
-	}
-
-
-
-
-
-	virtual bool OnUse(
-		cChunkInterface & a_ChunkInterface,
-		cWorldInterface & a_WorldInterface,
-		cPlayer & a_Player,
-		const Vector3i a_BlockPos,
-		eBlockFace a_BlockFace,
-		const Vector3i a_CursorPos
-	) override
-	{
-		const auto Meta = a_ChunkInterface.GetBlockMeta(a_BlockPos);
-
-		// Toggle the 3rd bit (addition / subtraction):
-		a_ChunkInterface.SetBlockMeta(a_BlockPos, Meta ^ 0x04);
-
-		// Update simulators:
-		a_WorldInterface.WakeUpSimulators(a_BlockPos);
-		return true;
-	}
-
-
-
-
-
-	virtual void OnCancelRightClick(
-		cChunkInterface & a_ChunkInterface,
-		cWorldInterface & a_WorldInterface,
-		cPlayer & a_Player,
-		const Vector3i a_BlockPos,
-		eBlockFace a_BlockFace
-	) override
-	{
-		UNUSED(a_ChunkInterface);
-		UNUSED(a_BlockFace);
-
-		a_WorldInterface.WakeUpSimulators(a_BlockPos);
-		a_WorldInterface.SendBlockTo(a_BlockPos, a_Player);
-	}
-
-
-
-
-
-	virtual bool IsUseable(void) override
-	{
-		return true;
-	}
-
-
-
-
-
-	virtual bool CanBeAt(cChunkInterface & a_ChunkInterface, const Vector3i a_RelPos, const cChunk & a_Chunk) override
-	{
-		if (a_RelPos.y <= 0)
-		{
-			return false;
-		}
-
-		BLOCKTYPE BelowBlock;
-		NIBBLETYPE BelowBlockMeta;
-		a_Chunk.GetBlockTypeMeta(a_RelPos.addedY(-1), BelowBlock, BelowBlockMeta);
-
-		if (cBlockInfo::FullyOccupiesVoxel(BelowBlock))
-		{
-			return true;
-		}
-		else if (cBlockSlabHandler::IsAnySlabType(BelowBlock))
-		{
-			// Check if the slab is turned up side down
-			if ((BelowBlockMeta & 0x08) == 0x08)
-			{
-				return true;
-			}
-		}
-		return false;
-	}
-
-
-
-
-
-	virtual cItems ConvertToPickups(NIBBLETYPE a_BlockMeta, cBlockEntity * a_BlockEntity, const cEntity * a_Digger, const cItem * a_Tool) override
-	{
-		return cItem(E_ITEM_COMPARATOR, 1, 0);
-	}
-
-
-
-
+	using Super::Super;

 	inline static bool IsInSubtractionMode(NIBBLETYPE a_Meta)
 	{
 		return ((a_Meta & 0x4) == 0x4);
 	}

+	inline static Vector3i GetFrontCoordinate(Vector3i a_Position, NIBBLETYPE a_Meta)
+	{
+		switch (a_Meta)
+		{
+			case 0x0: a_Position.z--; break;
+			case 0x1: a_Position.x++; break;
+			case 0x2: a_Position.z++; break;
+			case 0x3: a_Position.x--; break;
+			default:
+			{
+				LOGWARNING("%s: Unknown metadata: %d", __FUNCTION__, a_Meta);
+				ASSERT(!"Unknown metadata while determining orientation of comparator!");
+				break;
+			}
+		}

-
-
+		return a_Position;
+	}

 	inline static Vector3i GetSideCoordinate(Vector3i a_Position, NIBBLETYPE a_Meta, bool a_bInverse)
 	{
@@ -162,10 +80,6 @@ public:
 		return a_Position;
 	}

-
-
-
-
 	inline static Vector3i GetRearCoordinate(Vector3i a_Position, NIBBLETYPE a_Meta)
 	{
 		switch (a_Meta)
@@ -185,34 +99,99 @@ public:
 		return a_Position;
 	}

+private:

-
-
-
-	inline static Vector3i GetFrontCoordinate(Vector3i a_Position, NIBBLETYPE a_Meta)
+	virtual bool OnUse(
+		cChunkInterface & a_ChunkInterface,
+		cWorldInterface & a_WorldInterface,
+		cPlayer & a_Player,
+		const Vector3i a_BlockPos,
+		eBlockFace a_BlockFace,
+		const Vector3i a_CursorPos
+	) const override
 	{
-		switch (a_Meta)
-		{
-			case 0x0: a_Position.z--; break;
-			case 0x1: a_Position.x++; break;
-			case 0x2: a_Position.z++; break;
-			case 0x3: a_Position.x--; break;
-			default:
-			{
-				LOGWARNING("%s: Unknown metadata: %d", __FUNCTION__, a_Meta);
-				ASSERT(!"Unknown metadata while determining orientation of comparator!");
-				break;
-			}
-		}
+		const auto Meta = a_ChunkInterface.GetBlockMeta(a_BlockPos);

-		return a_Position;
+		// Toggle the 3rd bit (addition / subtraction):
+		a_ChunkInterface.SetBlockMeta(a_BlockPos, Meta ^ 0x04);
+
+		// Update simulators:
+		a_WorldInterface.WakeUpSimulators(a_BlockPos);
+		return true;
 	}





-	virtual ColourID GetMapBaseColourID(NIBBLETYPE a_Meta) override
+	virtual void OnCancelRightClick(
+		cChunkInterface & a_ChunkInterface,
+		cWorldInterface & a_WorldInterface,
+		cPlayer & a_Player,
+		const Vector3i a_BlockPos,
+		eBlockFace a_BlockFace
+	) const override
+	{
+		UNUSED(a_ChunkInterface);
+		UNUSED(a_BlockFace);
+
+		a_WorldInterface.WakeUpSimulators(a_BlockPos);
+		a_WorldInterface.SendBlockTo(a_BlockPos, a_Player);
+	}
+
+
+
+
+
+	virtual bool IsUseable(void) const override
+	{
+		return true;
+	}
+
+
+
+
+
+	virtual bool CanBeAt(cChunkInterface & a_ChunkInterface, const Vector3i a_RelPos, const cChunk & a_Chunk) const override
+	{
+		if (a_RelPos.y <= 0)
+		{
+			return false;
+		}
+
+		BLOCKTYPE BelowBlock;
+		NIBBLETYPE BelowBlockMeta;
+		a_Chunk.GetBlockTypeMeta(a_RelPos.addedY(-1), BelowBlock, BelowBlockMeta);
+
+		if (cBlockInfo::FullyOccupiesVoxel(BelowBlock))
+		{
+			return true;
+		}
+		else if (cBlockSlabHandler::IsAnySlabType(BelowBlock))
+		{
+			// Check if the slab is turned up side down
+			if ((BelowBlockMeta & 0x08) == 0x08)
+			{
+				return true;
+			}
+		}
+		return false;
+	}
+
+
+
+
+
+	virtual cItems ConvertToPickups(NIBBLETYPE a_BlockMeta, cBlockEntity * a_BlockEntity, const cEntity * a_Digger, const cItem * a_Tool) const override
+	{
+		return cItem(E_ITEM_COMPARATOR, 1, 0);
+	}
+
+
+
+
+
+	virtual ColourID GetMapBaseColourID(NIBBLETYPE a_Meta) const override
 	{
 		UNUSED(a_Meta);
 		return 11;