diff options
author | Andreas Haas <liu.gam3@gmail.com> | 2017-03-26 15:59:13 +0200 |
---|---|---|
committer | Andreas Haas <liu.gam3@gmail.com> | 2017-03-26 15:59:32 +0200 |
commit | c0b67568757ccc22811e16348713ef3119e18f3e (patch) | |
tree | c2f13f324454478a76c623141611f79628d52ce6 /main/input_default.h | |
parent | a0b0dff6fdbdc4be78087aa572f3da5dbb8daa01 (diff) | |
download | redot-engine-c0b67568757ccc22811e16348713ef3119e18f3e.tar.gz |
Input: Remove usage of platform dependent event IDs.
The ID property for InputEvents is set by `SceneTree` when sending the event down the tree.
So there's no need for the platform specific code to set this value when it will later be overriden anyway...
Diffstat (limited to 'main/input_default.h')
-rw-r--r-- | main/input_default.h | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/main/input_default.h b/main/input_default.h index 4f298d6d55..20ff8b958a 100644 --- a/main/input_default.h +++ b/main/input_default.h @@ -169,8 +169,8 @@ private: Vector<JoyDeviceMapping> map_db; JoyEvent _find_to_event(String p_to); - uint32_t _button_event(uint32_t p_last_id, int p_device, int p_index, bool p_pressed); - uint32_t _axis_event(uint32_t p_last_id, int p_device, int p_axis, float p_value); + void _button_event(int p_device, int p_index, bool p_pressed); + void _axis_event(int p_device, int p_axis, float p_value); float _handle_deadzone(int p_device, int p_axis, float p_value); public: @@ -228,9 +228,9 @@ public: virtual void set_mouse_in_window(bool p_in_window); void parse_mapping(String p_mapping); - uint32_t joy_button(uint32_t p_last_id, int p_device, int p_button, bool p_pressed); - uint32_t joy_axis(uint32_t p_last_id, int p_device, int p_axis, const JoyAxis &p_value); - uint32_t joy_hat(uint32_t p_last_id, int p_device, int p_val); + void joy_button(int p_device, int p_button, bool p_pressed); + void joy_axis(int p_device, int p_axis, const JoyAxis &p_value); + void joy_hat(int p_device, int p_val); virtual void add_joy_mapping(String p_mapping, bool p_update_existing = false); virtual void remove_joy_mapping(String p_guid); |