godotengine
/
godot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #11280 from BastiaanOlij/fix_arvr_joyid 

joyid is set to -1, not 0 when no joystick entity has been created
This commit is contained in:
Andreas Haas 2017-09-15 10:33:48 +02:00 committed by GitHub
parent 7dffed485b c46b8f444a
commit 6b729726e0
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
scene/3d/arvr_nodes.cpp
View File

@ -184,7 +184,7 @@ int ARVRController::get_joystick_id() const {
int ARVRController::is_button_pressed(int p_button) const {
int joy_id = get_joystick_id();
if (joy_id == 0) {
if (joy_id == -1) {
return false;
};
@ -193,7 +193,7 @@ int ARVRController::is_button_pressed(int p_button) const {
float ARVRController::get_joystick_axis(int p_axis) const {
int joy_id = get_joystick_id();
if (joy_id == 0) {
if (joy_id == -1) {
return 0.0;
};