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

Android: Fix formatting corruption in the JNI

This commit is contained in:
Ender's Games 2018-08-21 12:33:53 -04:00
parent 1619d85663
commit 16f6b2beb4
1 changed files with 12 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
shell/android-studio/reicast/src/main/jni/src/Android.cpp
View File

@ -223,8 +223,8 @@ static void *ThreadHandler(void *UserData)
strcat(Args[2],P); strcat(Args[2],P);
} }
// Run nullDC emulator // Run nullDC emulator
dc_init(Args[2]? 3:1,Args); dc_init(Args[2]? 3:1,Args);
return 0; return 0;
} }
@ -274,18 +274,17 @@ MapleDeviceType GetMapleDeviceType(int value)
void os_SetupInput() void os_SetupInput()
{ {
// Create first controller // Create first controller
mcfg_CreateController(0, MDT_SegaVMU, MDT_SegaVMU); mcfg_CreateController(0, MDT_SegaVMU, MDT_SegaVMU);
// Add additonal controllers // Add additonal controllers
for (int i = 0; i < 3; i++) for (int i = 0; i < 3; i++)
{ {
if (add_controllers[i]) if (add_controllers[i])
mcfg_CreateController(i + 1, mcfg_CreateController(i + 1,
GetMapleDeviceType(controller_periphs[i + 1][0]), GetMapleDeviceType(controller_periphs[i + 1][0]),
GetMapleDeviceType(controller_periphs[i + 1][1]) GetMapleDeviceType(controller_periphs[i + 1][1]));
); }
}
} }
void os_SetWindowText(char const *Text) void os_SetWindowText(char const *Text)