libretro/RetroArch
1
0
Fork 0
mirror of https://github.com/libretro/RetroArch.git synced 2025-02-11 12:05:52 +00:00
Code Issues Actions 25 Packages Projects Releases Wiki Activity

input_remapping_state - remove function and inline inside input_driver.c

Browse Source 
input_state function
This commit is contained in:
twinaphex 2016-11-06 15:42:26 +01:00
parent 7e5d2321c5
commit cfa01f623d
3 changed files with 19 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
input/input_driver.c
View File

@ -453,7 +453,25 @@ int16_t input_state(unsigned port, unsigned device,
}
if (settings->input.remap_binds_enable)
input_remapping_state(port, &device, &idx, &id);
{
switch (device)
{
case RETRO_DEVICE_JOYPAD:
if (id < RARCH_FIRST_CUSTOM_BIND)
id = settings->input.remap_ids[port][id];
break;
case RETRO_DEVICE_ANALOG:
if (idx < 2 && id < 2)
{
unsigned new_id = RARCH_FIRST_CUSTOM_BIND + (idx * 2 + id);
new_id = settings->input.remap_ids[port][new_id];
idx = (new_id & 2) >> 1;
id = new_id & 1;
}
break;
}
}
if (!input_driver_flushing_input
&& !input_driver_block_libretro_input)

24
input/input_remapping.c
View File

@ -192,27 +192,3 @@ void input_remapping_set_defaults(void)
settings->input.remap_ids[i][RARCH_FIRST_CUSTOM_BIND + j] = j;
}
}
void input_remapping_state(unsigned port,
unsigned *device, unsigned *idx, unsigned *id)
{
settings_t *settings = config_get_ptr();
switch (*device)
{
case RETRO_DEVICE_JOYPAD:
if (*id < RARCH_FIRST_CUSTOM_BIND)
*id = settings->input.remap_ids[port][*id];
break;
case RETRO_DEVICE_ANALOG:
if (*idx < 2 && *id < 2)
{
unsigned new_id = RARCH_FIRST_CUSTOM_BIND + (*idx * 2 + *id);
new_id = settings->input.remap_ids[port][new_id];
*idx = (new_id & 2) >> 1;
*id = new_id & 1;
}
break;
}
}

3
input/input_remapping.h
View File

@ -46,9 +46,6 @@ bool input_remapping_save_file(const char *path);
void input_remapping_set_defaults(void);
void input_remapping_state(unsigned port,
unsigned *device, unsigned *idx, unsigned *id);
RETRO_END_DECLS
#endif