numeric: Fix clang, broken since d5456da

[minetest.git] / src / client / joystick_controller.h

diff --git a/src/client/joystick_controller.h b/src/client/joystick_controller.h
index baec4e412c58999f27bd8e3e5c0c67a344935ce9..7baacd81b0a57a3b2d46b4078c87e4bbef826dfa 100644 (file)
--- a/src/client/joystick_controller.h
+++ b/src/client/joystick_controller.h
@@ -17,8 +17,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 */
 
-#ifndef JOYSTICK_HEADER
-#define JOYSTICK_HEADER
+#pragma once
 
 #include "irrlichttypes_extrabloated.h"
 #include "keys.h"
@@ -52,7 +51,8 @@ struct JoystickCombination {
 
 struct JoystickButtonCmb : public JoystickCombination {
 
-       JoystickButtonCmb() {}
+       JoystickButtonCmb() = default;
+
        JoystickButtonCmb(GameKeyType key, u32 filter_mask, u32 compare_mask) :
                filter_mask(filter_mask),
                compare_mask(compare_mask)
@@ -60,6 +60,8 @@ struct JoystickButtonCmb : public JoystickCombination {
                this->key = key;
        }
 
+       virtual ~JoystickButtonCmb() = default;
+
        virtual bool isTriggered(const irr::SEvent::SJoystickEvent &ev) const;
 
        u32 filter_mask;
@@ -68,7 +70,8 @@ struct JoystickButtonCmb : public JoystickCombination {
 
 struct JoystickAxisCmb : public JoystickCombination {
 
-       JoystickAxisCmb() {}
+       JoystickAxisCmb() = default;
+
        JoystickAxisCmb(GameKeyType key, u16 axis_to_compare, int direction, s16 thresh) :
                axis_to_compare(axis_to_compare),
                direction(direction),
@@ -77,7 +80,9 @@ struct JoystickAxisCmb : public JoystickCombination {
                this->key = key;
        }
 
-       virtual bool isTriggered(const irr::SEvent::SJoystickEvent &ev) const;
+       virtual ~JoystickAxisCmb() = default;
+
+       bool isTriggered(const irr::SEvent::SJoystickEvent &ev) const override;
 
        u16 axis_to_compare;
 
@@ -166,5 +171,3 @@ class JoystickController {
        std::bitset<KeyType::INTERNAL_ENUM_COUNT> m_past_pressed_keys;
        std::bitset<KeyType::INTERNAL_ENUM_COUNT> m_past_released_keys;
 };
-
-#endif