Merge pull request #387 from negativeExponent/input_fix_warnings

input: Fix warnings [-Wincompatible-pointer-types]
This commit is contained in:
Autechre
2020-10-05 04:49:10 +02:00
committed by GitHub

View File

@@ -763,15 +763,15 @@ static void update_nes_controllers(unsigned port, unsigned device)
switch (device) switch (device)
{ {
case RETRO_DEVICE_FC_ARKANOID: case RETRO_DEVICE_FC_ARKANOID:
FCEUI_SetInputFC(SIFC_ARKANOID, &nes_input.FamicomData, 0); FCEUI_SetInputFC(SIFC_ARKANOID, nes_input.FamicomData, 0);
FCEU_printf(" Famicom Expansion: Arkanoid\n"); FCEU_printf(" Famicom Expansion: Arkanoid\n");
break; break;
case RETRO_DEVICE_FC_SHADOW: case RETRO_DEVICE_FC_SHADOW:
FCEUI_SetInputFC(SIFC_SHADOW, &nes_input.FamicomData, 1); FCEUI_SetInputFC(SIFC_SHADOW, nes_input.FamicomData, 1);
FCEU_printf(" Famicom Expansion: (Bandai) Hyper Shot\n"); FCEU_printf(" Famicom Expansion: (Bandai) Hyper Shot\n");
break; break;
case RETRO_DEVICE_FC_OEKAKIDS: case RETRO_DEVICE_FC_OEKAKIDS:
FCEUI_SetInputFC(SIFC_OEKAKIDS, &nes_input.FamicomData, 1); FCEUI_SetInputFC(SIFC_OEKAKIDS, nes_input.FamicomData, 1);
FCEU_printf(" Famicom Expansion: Oeka Kids Tablet\n"); FCEU_printf(" Famicom Expansion: Oeka Kids Tablet\n");
break; break;
case RETRO_DEVICE_FC_4PLAYERS: case RETRO_DEVICE_FC_4PLAYERS:
@@ -1740,7 +1740,7 @@ static void FCEUD_UpdateInput(void)
case RETRO_DEVICE_FC_ARKANOID: case RETRO_DEVICE_FC_ARKANOID:
case RETRO_DEVICE_FC_OEKAKIDS: case RETRO_DEVICE_FC_OEKAKIDS:
case RETRO_DEVICE_FC_SHADOW: case RETRO_DEVICE_FC_SHADOW:
get_mouse_input(0, &nes_input.FamicomData); get_mouse_input(0, nes_input.FamicomData);
break; break;
} }