ShuriZma
/
dolphin
mirror of https://github.com/dolphin-emu/dolphin.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #7301 from zackhow/wiicontroller 

Android: Return 0 on fail on WiimoteReal IOWrite and update WiimoteNew defaults
This commit is contained in:
Anthony 2018-08-05 00:05:11 -07:00 committed by GitHub
parent 1da910d984 ec5e46fa7a
commit 0a8e04e469
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Source/Android/app/src/main/assets/WiimoteNew.ini
View File

@ -267,7 +267,7 @@ Turntable/Stick/Radius = 100,000000
Turntable/Effect/Dial = `Axis 621` Turntable/Effect/Dial = `Axis 621`
Turntable/Crossfade/Left = `Axis 623` Turntable/Crossfade/Left = `Axis 623`
Turntable/Crossfade/Right = `Axis 624` Turntable/Crossfade/Right = `Axis 624`
Source = 1 Source = 0
[Wiimote3] [Wiimote3]
Device = Android/6/Touchscreen Device = Android/6/Touchscreen
Buttons/A = `Button 100` Buttons/A = `Button 100`
@ -402,7 +402,7 @@ Turntable/Stick/Radius = 100,000000
Turntable/Effect/Dial = `Axis 621` Turntable/Effect/Dial = `Axis 621`
Turntable/Crossfade/Left = `Axis 623` Turntable/Crossfade/Left = `Axis 623`
Turntable/Crossfade/Right = `Axis 624` Turntable/Crossfade/Right = `Axis 624`
Source = 1 Source = 0
[Wiimote4] [Wiimote4]
Device = Android/7/Touchscreen Device = Android/7/Touchscreen
Buttons/A = `Button 100` Buttons/A = `Button 100`
@ -537,4 +537,4 @@ Turntable/Stick/Radius = 100,000000
Turntable/Effect/Dial = `Axis 621` Turntable/Effect/Dial = `Axis 621`
Turntable/Crossfade/Left = `Axis 623` Turntable/Crossfade/Left = `Axis 623`
Turntable/Crossfade/Right = `Axis 624` Turntable/Crossfade/Right = `Axis 624`
Source = 1 Source = 0

2
Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/utils/Java_WiimoteAdapter.java
View File

@ -107,7 +107,7 @@ public class Java_WiimoteAdapter
1000); 1000);
if (write < 0) if (write < 0)
return -1; return 0;
return write + 1; return write + 1;
} }