From 3ff57559e36d3254c64e334fbe3bdd47398fe16f Mon Sep 17 00:00:00 2001 From: x12xx12x <44411062+12xx12@users.noreply.github.com> Date: Thu, 2 Dec 2021 00:31:10 +0100 Subject: ItemHandler initialisation is a constant expression (#5344) * Transition to non-pointer item handler * That is my destructor - I decide when I leave this world * I declare your destruction private and you final --- src/Items/ItemBow.h | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) (limited to 'src/Items/ItemBow.h') diff --git a/src/Items/ItemBow.h b/src/Items/ItemBow.h index 636df5753..d1993c03c 100644 --- a/src/Items/ItemBow.h +++ b/src/Items/ItemBow.h @@ -8,17 +8,14 @@ -class cItemBowHandler: +class cItemBowHandler final: public cItemHandler { using Super = cItemHandler; public: - cItemBowHandler(void): - Super(E_ITEM_BOW) - { - } + using Super::Super; @@ -31,7 +28,7 @@ public: const cItem & a_HeldItem, const Vector3i a_ClickedBlockPos, eBlockFace a_ClickedBlockFace - ) override + ) const override { ASSERT(a_Player != nullptr); @@ -47,7 +44,7 @@ public: - virtual void OnItemShoot(cPlayer * a_Player, const Vector3i a_BlockPos, eBlockFace a_BlockFace) override + virtual void OnItemShoot(cPlayer * a_Player, const Vector3i a_BlockPos, eBlockFace a_BlockFace) const override { // Actual shot - produce the arrow with speed based on the number of ticks that the bow was charged UNUSED(a_BlockPos); -- cgit v1.2.3