1 files changed, 17 insertions, 16 deletions

diff --git a/core/input/input.h b/core/input/input.h
index ac688b53b8..7bb7889a43 100644
--- a/core/input/input.h
+++ b/core/input/input.h
@@ -82,11 +82,11 @@ public:
 private:
 	MouseButton mouse_button_mask = MouseButton::NONE;
 
-	Set<Key> physical_keys_pressed;
-	Set<Key> keys_pressed;
-	Set<JoyButton> joy_buttons_pressed;
-	Map<JoyAxis, float> _joy_axis;
-	//Map<StringName,int> custom_action_press;
+	RBSet<Key> physical_keys_pressed;
+	RBSet<Key> keys_pressed;
+	RBSet<JoyButton> joy_buttons_pressed;
+	RBMap<JoyAxis, float> _joy_axis;
+	//RBMap<StringName,int> custom_action_press;
 	Vector3 gravity;
 	Vector3 accelerometer;
 	Vector3 magnetometer;
@@ -103,7 +103,7 @@ private:
 		float raw_strength;
 	};
 
-	Map<StringName, Action> action_state;
+	HashMap<StringName, Action> action_state;
 
 	bool emulate_touch_from_mouse = false;
 	bool emulate_mouse_from_touch = false;
@@ -113,10 +113,10 @@ private:
 	int mouse_from_touch_index = -1;
 
 	struct VelocityTrack {
-		uint64_t last_tick;
+		uint64_t last_tick = 0;
 		Vector2 velocity;
 		Vector2 accum;
-		float accum_t;
+		float accum_t = 0.0f;
 		float min_ref_frame;
 		float max_ref_frame;
 
@@ -137,8 +137,8 @@ private:
 	};
 
 	VelocityTrack mouse_velocity_track;
-	Map<int, VelocityTrack> touch_velocity_track;
-	Map<int, Joypad> joy_names;
+	HashMap<int, VelocityTrack> touch_velocity_track;
+	HashMap<int, Joypad> joy_names;
 	int fallback_mapping = -1;
 
 	CursorShape default_shape = CURSOR_ARROW;
@@ -157,9 +157,9 @@ private:
 	};
 
 	struct JoyEvent {
-		int type;
-		int index; // Can be either JoyAxis or JoyButton.
-		float value;
+		int type = TYPE_MAX;
+		int index = -1; // Can be either JoyAxis or JoyButton.
+		float value = 0.f;
 	};
 
 	struct JoyBinding {
@@ -219,7 +219,7 @@ private:
 	static void (*warp_mouse_func)(const Vector2 &p_position);
 
 	static CursorShape (*get_current_cursor_shape_func)();
-	static void (*set_custom_mouse_cursor_func)(const RES &, CursorShape, const Vector2 &);
+	static void (*set_custom_mouse_cursor_func)(const Ref<Resource> &, CursorShape, const Vector2 &);
 
 	EventDispatchFunc event_dispatch_function = nullptr;
 
@@ -231,7 +231,7 @@ protected:
 		uint64_t timestamp;
 	};
 
-	Map<int, VibrationInfo> joy_vibration;
+	HashMap<int, VibrationInfo> joy_vibration;
 
 	static void _bind_methods();
 
@@ -305,7 +305,7 @@ public:
 	CursorShape get_default_cursor_shape() const;
 	void set_default_cursor_shape(CursorShape p_shape);
 	CursorShape get_current_cursor_shape() const;
-	void set_custom_mouse_cursor(const RES &p_cursor, CursorShape p_shape = Input::CURSOR_ARROW, const Vector2 &p_hotspot = Vector2());
+	void set_custom_mouse_cursor(const Ref<Resource> &p_cursor, CursorShape p_shape = Input::CURSOR_ARROW, const Vector2 &p_hotspot = Vector2());
 
 	void parse_mapping(String p_mapping);
 	void joy_button(int p_device, JoyButton p_button, bool p_pressed);
@@ -331,6 +331,7 @@ public:
 	void set_event_dispatch_function(EventDispatchFunc p_function);
 
 	Input();
+	~Input();
 };
 
 VARIANT_ENUM_CAST(Input::MouseMode);