diff options
| author | Ariel Manzur <ariel@godotengine.org> | 2015-12-21 09:17:15 -0300 |
|---|---|---|
| committer | Ariel Manzur <ariel@godotengine.org> | 2015-12-21 09:17:15 -0300 |
| commit | 0576e1e28f41f103cd06452d810a04265e3574cc (patch) | |
| tree | 817c1a5e3ca8b8f786e013c0322e4052e7f85d59 /core/os/input.h | |
| parent | 72a6b137ba256f5198843f8980107c350d52e5ca (diff) | |
| parent | 15429d6ac95acb044c9eebd64356f33e7e5d14ef (diff) | |
| download | redot-engine-0576e1e28f41f103cd06452d810a04265e3574cc.tar.gz | |
Merge branch 'master' of https://github.com/godotengine/godot
Diffstat (limited to 'core/os/input.h')
| -rw-r--r-- | core/os/input.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/core/os/input.h b/core/os/input.h index 8aa0e6b18a..d81ebf4ec3 100644 --- a/core/os/input.h +++ b/core/os/input.h @@ -62,7 +62,7 @@ public: virtual float get_joy_axis(int p_device,int p_axis)=0; virtual String get_joy_name(int p_idx)=0; - virtual void joy_connection_changed(int p_idx, bool p_connected, String p_name)=0; + virtual void joy_connection_changed(int p_idx, bool p_connected, String p_name, String p_guid)=0; virtual Point2 get_mouse_pos() const=0; |