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/BlockBookShelf.h | 52 ++++++++++++++++++++++----------------------- 1 file changed, 26 insertions(+), 26 deletions(-) (limited to 'src/Blocks/BlockBookShelf.h') diff --git a/src/Blocks/BlockBookShelf.h b/src/Blocks/BlockBookShelf.h index 4d1afb1fa..28994c009 100644 --- a/src/Blocks/BlockBookShelf.h +++ b/src/Blocks/BlockBookShelf.h @@ -1,26 +1,26 @@ - -#pragma once - -#include "BlockHandler.h" - - - - -class cBlockBookShelfHandler : - public cBlockHandler -{ - public: - cBlockBookShelfHandler(BLOCKTYPE a_BlockType) : - cBlockHandler(a_BlockType) - { - } - - virtual cItems ConvertToPickups(NIBBLETYPE a_BlockMeta, cBlockEntity * a_BlockEntity, const cEntity * a_Digger, const cItem * a_Tool) override - { - if (ToolHasSilkTouch(a_Tool)) - { - return cItem(m_BlockType, 1); - } - return cItem(E_ITEM_BOOK, 3); - } -}; + +#pragma once + +#include "BlockHandler.h" + + + + +class cBlockBookShelfHandler : + public cBlockHandler +{ +public: + + using cBlockHandler::cBlockHandler; + +private: + + virtual cItems ConvertToPickups(NIBBLETYPE a_BlockMeta, cBlockEntity * a_BlockEntity, const cEntity * a_Digger, const cItem * a_Tool) const override + { + if (ToolHasSilkTouch(a_Tool)) + { + return cItem(m_BlockType, 1); + } + return cItem(E_ITEM_BOOK, 3); + } +}; -- cgit v1.2.3