From 68cced73afe546328cf94ed07c57deee47bfadec Mon Sep 17 00:00:00 2001
From: Tiger Wang <ziwei.tiger@outlook.com>
Date: Sun, 20 Sep 2020 14:50:52 +0100
Subject: 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>
---
 src/Blocks/BlockJukebox.h | 17 +++--------------
 1 file changed, 3 insertions(+), 14 deletions(-)

(limited to 'src/Blocks/BlockJukebox.h')

diff --git a/src/Blocks/BlockJukebox.h b/src/Blocks/BlockJukebox.h
index 22b02a2c7..5b655e71d 100644
--- a/src/Blocks/BlockJukebox.h
+++ b/src/Blocks/BlockJukebox.h
@@ -11,26 +11,15 @@
 class cBlockJukeboxHandler :
 	public cClearMetaOnDrop<cBlockEntityHandler>
 {
-	using super = cClearMetaOnDrop<cBlockEntityHandler>;
-
 public:
 
-	cBlockJukeboxHandler(BLOCKTYPE a_BlockType):
-		super(a_BlockType)
-	{
-	}
-
-
+	using cClearMetaOnDrop<cBlockEntityHandler>::cClearMetaOnDrop;
 
+private:
 
-
-	virtual ColourID GetMapBaseColourID(NIBBLETYPE a_Meta) override
+	virtual ColourID GetMapBaseColourID(NIBBLETYPE a_Meta) const override
 	{
 		UNUSED(a_Meta);
 		return 6;
 	}
 } ;
-
-
-
-
-- 
cgit v1.2.3