From 68cced73afe546328cf94ed07c57deee47bfadec Mon Sep 17 00:00:00 2001 From: Tiger Wang 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 --- src/Blocks/BlockCake.h | 17 +++++++---------- 1 file changed, 7 insertions(+), 10 deletions(-) (limited to 'src/Blocks/BlockCake.h') diff --git a/src/Blocks/BlockCake.h b/src/Blocks/BlockCake.h index b7506f2e7..089dc58bd 100644 --- a/src/Blocks/BlockCake.h +++ b/src/Blocks/BlockCake.h @@ -10,15 +10,12 @@ class cBlockCakeHandler: public cBlockHandler { using Super = cBlockHandler; -public: - cBlockCakeHandler(BLOCKTYPE a_BlockType): - Super(a_BlockType) - { - } - +public: + using Super::Super; +private: virtual bool OnUse( cChunkInterface & a_ChunkInterface, @@ -27,7 +24,7 @@ public: const Vector3i a_BlockPos, eBlockFace a_BlockFace, const Vector3i a_CursorPos - ) override + ) const override { NIBBLETYPE Meta = a_ChunkInterface.GetBlockMeta(a_BlockPos); @@ -52,7 +49,7 @@ public: - virtual cItems ConvertToPickups(NIBBLETYPE a_BlockMeta, cBlockEntity * a_BlockEntity, const cEntity * a_Digger, const cItem * a_Tool) override + virtual cItems ConvertToPickups(NIBBLETYPE a_BlockMeta, cBlockEntity * a_BlockEntity, const cEntity * a_Digger, const cItem * a_Tool) const override { // Give nothing return {}; @@ -62,12 +59,12 @@ public: - virtual bool IsUseable(void) override + virtual bool IsUseable(void) const override { return true; } - virtual ColourID GetMapBaseColourID(NIBBLETYPE a_Meta) override + virtual ColourID GetMapBaseColourID(NIBBLETYPE a_Meta) const override { UNUSED(a_Meta); return 14; -- cgit v1.2.3