X-Git-Url: https://git.librecmc.org/?a=blobdiff_plain;ds=sidebyside;f=src%2Fclient%2Fjoystick_controller.h;h=7baacd81b0a57a3b2d46b4078c87e4bbef826dfa;hb=e462a9a5ef46776d974203bb44e0b89e8c980b29;hp=867a0c3f2a68cf12c39ab575d17c55ae473b4122;hpb=bce0d458d8cda70c10d78ea9ec476474f0a6f01a;p=oweals%2Fminetest.git

diff --git a/src/client/joystick_controller.h b/src/client/joystick_controller.h
index 867a0c3f2..7baacd81b 100644
--- 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;
 
@@ -149,13 +154,13 @@ public:
 	f32 doubling_dtime;
 
 private:
-	void setLayoutFromControllerName(std::string name);
+	void setLayoutFromControllerName(const std::string &name);
 
 	JoystickLayout m_layout;
 
 	s16 m_axes_vals[JA_COUNT];
 
-	u8 m_joystick_id;
+	u8 m_joystick_id = 0;
 
 	std::bitset<KeyType::INTERNAL_ENUM_COUNT> m_pressed_keys;
 
@@ -166,5 +171,3 @@ private:
 	std::bitset<KeyType::INTERNAL_ENUM_COUNT> m_past_pressed_keys;
 	std::bitset<KeyType::INTERNAL_ENUM_COUNT> m_past_released_keys;
 };
-
-#endif