This commit is contained in:
twinaphex 2020-07-25 00:02:26 +02:00
parent b9cb8c8890
commit d92280e20e

View File

@ -128,11 +128,12 @@ static void *wiiu_gca_init(void *handle)
static void wiiu_gca_free(void *data) static void wiiu_gca_free(void *data)
{ {
hid_wiiu_gca_instance_t *instance = (hid_wiiu_gca_instance_t *)data;
int i; int i;
hid_wiiu_gca_instance_t *instance = (hid_wiiu_gca_instance_t *)data;
if (!instance)
return;
if(instance)
{
instance->online = false; instance->online = false;
for (i = 0; i < 4; i++) for (i = 0; i < 4; i++)
@ -140,7 +141,6 @@ static void wiiu_gca_free(void *data)
free(instance); free(instance);
} }
}
static void wiiu_gca_handle_packet(void *data, uint8_t *buffer, size_t size) static void wiiu_gca_handle_packet(void *data, uint8_t *buffer, size_t size)
{ {
@ -260,7 +260,7 @@ static void wiiu_gca_update_analog_state(gca_pad_t *pad)
* by 256 to get the 16-bit range RetroArch expects. */ * by 256 to get the 16-bit range RetroArch expects. */
for (pad_axis = 0; pad_axis < 4; pad_axis++) for (pad_axis = 0; pad_axis < 4; pad_axis++)
{ {
axis = pad_axis % 2 ? 0 : 1; axis = (pad_axis % 2) ? 0 : 1;
stick = pad_axis / 2; stick = pad_axis / 2;
interpolated = pad->data[3 + pad_axis]; interpolated = pad->data[3 + pad_axis];
/* libretro requires "up" to be negative, so we invert the y axis */ /* libretro requires "up" to be negative, so we invert the y axis */
@ -328,9 +328,8 @@ static const char *wiiu_gca_get_name(void *data)
static int16_t wiiu_gca_button(void *data, uint16_t joykey) static int16_t wiiu_gca_button(void *data, uint16_t joykey)
{ {
gca_pad_t *pad = (gca_pad_t *)data; gca_pad_t *pad = (gca_pad_t *)data;
if (!pad)
return 0;
if (joykey < 31) if (joykey < 31)
if (pad)
return pad->buttons & (1 << joykey); return pad->buttons & (1 << joykey);
return 0; return 0;
} }