X-Git-Url: https://git.yukkurigames.com/?p=enjoyable.git;a=blobdiff_plain;f=JoystickController.m;h=d87dca7d8fdb0fead42e07ae70aa0023eeb2e028;hp=8b350a489788f25f33373a7cf4cc0e168a7b1b55;hb=25dd74a4a34f4ba7ec797360bd8f92cbd7bc758e;hpb=250a974e2d9d2d2dd8dfb8a99b07a77c7e2f637a diff --git a/JoystickController.m b/JoystickController.m index 8b350a4..d87dca7 100644 --- a/JoystickController.m +++ b/JoystickController.m @@ -62,7 +62,7 @@ static void input_callback(void *ctx, IOReturn inResult, void *inSender, IOHIDVa [mainAction notifyEvent:value]; NSArray *children = mainAction.children ? mainAction.children : mainAction ? @[mainAction] : @[]; for (JSAction *subaction in children) { - Target *target = [controller.currentConfig getTargetForAction:subaction]; + Target *target = controller.currentConfig[subaction]; target.magnitude = mainAction.magnitude; target.running = subaction.active; if (target.running && target.isContinuous) @@ -82,7 +82,7 @@ static void input_callback(void *ctx, IOReturn inResult, void *inSender, IOHIDVa } static int findAvailableIndex(NSArray *list, Joystick *js) { - for (int index = 0; ; index++) { + for (int index = 1; ; index++) { BOOL available = YES; for (Joystick *used in list) { if ([used.productName isEqualToString:js.productName] && used.index == index) {