mirror/RetroArch
1
0
Fork 0
mirror of https://github.com/libretro/RetroArch synced 2025-04-18 14:42:30 +00:00
Code Issues Packages Projects Releases Wiki Activity

try to include analogs in input remapping

Browse Source
This commit is contained in:
radius 2015-04-09 17:06:41 -05:00
parent 62146221b4
commit eef29b0355
4 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
input/input_remapping.c
View File

@ -70,7 +70,7 @@ bool input_remapping_load_file(const char *path)
* *
* Saves remapping values to file. * Saves remapping values to file.
* *
* Returns: true (1) if successfull, otherwise false (0). * Returns: true (1) if successful, otherwise false (0).
**/ **/
bool input_remapping_save_file(const char *path) bool input_remapping_save_file(const char *path)
{ {

2
input/input_remapping.h
View File

@ -40,7 +40,7 @@ bool input_remapping_load_file(const char *path);
* *
* Saves remapping values to file. * Saves remapping values to file.
* *
* Returns: true (1) if successfull, otherwise false (0). * Returns: true (1) if successful, otherwise false (0).
**/ **/
bool input_remapping_save_file(const char *path); bool input_remapping_save_file(const char *path);

4
libretro_version_1.c
View File

@ -433,11 +433,11 @@ static int16_t input_state(unsigned port, unsigned device,
if (settings->input.remap_binds_enable) if (settings->input.remap_binds_enable)
{ {
if (id < RARCH_FIRST_CUSTOM_BIND) if (id < RARCH_FIRST_META_KEY)
id = settings->input.remap_ids[port][id]; id = settings->input.remap_ids[port][id];
} }
if (!driver->block_libretro_input) if (!driver->block_libretro_input)
{ {
if (((id < RARCH_FIRST_META_KEY) || (device == RETRO_DEVICE_KEYBOARD))) if (((id < RARCH_FIRST_META_KEY) || (device == RETRO_DEVICE_KEYBOARD)))
res = input_driver_state(libretro_input_binds, port, device, idx, id); res = input_driver_state(libretro_input_binds, port, device, idx, id);

4
menu/menu_entries_cbs_deferred_push.c
View File

@ -1428,7 +1428,7 @@ static int deferred_push_core_input_remapping_options(void *data, void *userdata
for (p = 0; p < settings->input.max_users; p++) for (p = 0; p < settings->input.max_users; p++)
{ {
for (retro_id = 0; retro_id < RARCH_FIRST_CUSTOM_BIND; retro_id++) for (retro_id = 0; retro_id < RARCH_FIRST_META_KEY; retro_id++)
{ {
char desc_label[64]; char desc_label[64];
unsigned user = p + 1; unsigned user = p + 1;
@ -1441,7 +1441,7 @@ static int deferred_push_core_input_remapping_options(void *data, void *userdata
"User %u %s : ", user, description); "User %u %s : ", user, description);
menu_list_push(list, desc_label, "", menu_list_push(list, desc_label, "",
MENU_SETTINGS_INPUT_DESC_BEGIN + MENU_SETTINGS_INPUT_DESC_BEGIN +
(p * RARCH_FIRST_CUSTOM_BIND) + retro_id, 0); (p * RARCH_FIRST_META_KEY) + retro_id, 0);
} }
} }