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 /platform/osx/os_osx.mm | |
| parent | a0b0dff6fdbdc4be78087aa572f3da5dbb8daa01 (diff) | |
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 'platform/osx/os_osx.mm')
| -rw-r--r-- | platform/osx/os_osx.mm | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/platform/osx/os_osx.mm b/platform/osx/os_osx.mm index 0699978caf..8411bdb114 100644 --- a/platform/osx/os_osx.mm +++ b/platform/osx/os_osx.mm @@ -1698,7 +1698,6 @@ void OS_OSX::process_events() { void OS_OSX::push_input(const InputEvent& p_event) { InputEvent ev=p_event; - ev.ID=last_id++; //print_line("EV: "+String(ev)); input->parse_input_event(ev); } @@ -1725,7 +1724,7 @@ void OS_OSX::run() { while (!force_quit) { process_events(); // get rid of pending events - last_id = joypad_osx->process_joypads(last_id); + joypad_osx->process_joypads(); if (Main::iteration()==true) break; }; @@ -1822,7 +1821,6 @@ OS_OSX::OS_OSX() { [NSApp setDelegate:delegate]; - last_id=1; cursor_shape=CURSOR_ARROW; current_screen = 0; |