mirror/RetroArch
1
0
Fork 0
mirror of https://github.com/libretro/RetroArch synced 2025-04-09 21:45:45 +00:00
Code Issues Packages Projects Releases Wiki Activity

Change local bind variable to keybind

Browse Source
This commit is contained in:
twinaphex 2014-10-20 22:50:11 +02:00
parent e5dfdc086a
commit 885d4eae7c
1 changed files with 19 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
settings_data.c
View File

@ -629,13 +629,13 @@ void setting_data_get_string_representation(rarch_setting_t* setting,
break; break;
case ST_BIND: case ST_BIND:
{ {
const struct retro_keybind* bind = (const struct retro_keybind*) const struct retro_keybind* keybind = (const struct retro_keybind*)
setting->value.keybind; setting->value.keybind;
const struct retro_keybind* auto_bind = const struct retro_keybind* auto_bind =
(const struct retro_keybind*) (const struct retro_keybind*)
input_get_auto_bind(setting->index_offset, bind->id); input_get_auto_bind(setting->index_offset, keybind->id);
input_get_bind_string(buf, bind, auto_bind, sizeof_buf); input_get_bind_string(buf, keybind, auto_bind, sizeof_buf);
} }
break; break;
/* TODO */ /* TODO */
@ -1083,15 +1083,15 @@ static int setting_data_bind_action_start(void *data)
return -1; return -1;
struct retro_keybind *def_binds = (struct retro_keybind *)retro_keybinds_1; struct retro_keybind *def_binds = (struct retro_keybind *)retro_keybinds_1;
struct retro_keybind *bind = (struct retro_keybind*)setting->value.keybind; struct retro_keybind *keybind = (struct retro_keybind*)setting->value.keybind;
if (!bind) if (!keybind)
return -1; return -1;
if (!driver.menu->bind_mode_keyboard) if (!driver.menu->bind_mode_keyboard)
{ {
bind->joykey = NO_BTN; keybind->joykey = NO_BTN;
bind->joyaxis = AXIS_NONE; keybind->joyaxis = AXIS_NONE;
return 0; return 0;
} }
@ -1101,14 +1101,14 @@ static int setting_data_bind_action_start(void *data)
if (!def_binds) if (!def_binds)
return -1; return -1;
bind->key = def_binds[setting->bind_type - MENU_SETTINGS_BIND_BEGIN].key; keybind->key = def_binds[setting->bind_type - MENU_SETTINGS_BIND_BEGIN].key;
return 0; return 0;
} }
static int setting_data_bind_action_ok(void *data, unsigned action) static int setting_data_bind_action_ok(void *data, unsigned action)
{ {
struct retro_keybind *bind = NULL; struct retro_keybind *keybind = NULL;
rarch_setting_t *setting = (rarch_setting_t*)data; rarch_setting_t *setting = (rarch_setting_t*)data;
if (!setting) if (!setting)
@ -1117,14 +1117,14 @@ static int setting_data_bind_action_ok(void *data, unsigned action)
if (!driver.menu || !driver.menu->menu_list) if (!driver.menu || !driver.menu->menu_list)
return -1; return -1;
bind = (struct retro_keybind*)setting->value.keybind; keybind = (struct retro_keybind*)setting->value.keybind;
if (!bind) if (!keybind)
return -1; return -1;
driver.menu->binds.begin = setting->bind_type; driver.menu->binds.begin = setting->bind_type;
driver.menu->binds.last = setting->bind_type; driver.menu->binds.last = setting->bind_type;
driver.menu->binds.target = bind; driver.menu->binds.target = keybind;
driver.menu->binds.player = setting->index_offset; driver.menu->binds.player = setting->index_offset;
menu_list_push_stack( menu_list_push_stack(
driver.menu->menu_list, driver.menu->menu_list,
@ -4361,14 +4361,14 @@ static bool setting_data_append_list_input_options(
for (i = 0; i < RARCH_BIND_LIST_END; i ++) for (i = 0; i < RARCH_BIND_LIST_END; i ++)
{ {
const struct input_bind_map* bind = (const struct input_bind_map*) const struct input_bind_map* keybind = (const struct input_bind_map*)
&input_config_bind_map[i]; &input_config_bind_map[i];
if (!bind || !bind->meta) if (!keybind || !keybind->meta)
continue; continue;
CONFIG_BIND(g_settings.input.binds[0][i], 0, 0, CONFIG_BIND(g_settings.input.binds[0][i], 0, 0,
bind->base, bind->desc, &retro_keybinds_1[i], keybind->base, keybind->desc, &retro_keybinds_1[i],
group_info.name, subgroup_info.name); group_info.name, subgroup_info.name);
settings_list_current_add_bind_type(list, list_info, i + MENU_SETTINGS_BIND_BEGIN); settings_list_current_add_bind_type(list, list_info, i + MENU_SETTINGS_BIND_BEGIN);
} }
@ -4397,14 +4397,14 @@ static bool setting_data_append_list_input_options(
{ {
char label[PATH_MAX]; char label[PATH_MAX];
char name[PATH_MAX]; char name[PATH_MAX];
const struct input_bind_map* bind = const struct input_bind_map* keybind =
(const struct input_bind_map*)&input_config_bind_map[i]; (const struct input_bind_map*)&input_config_bind_map[i];
if (!bind || bind->meta) if (!keybind || keybind->meta)
continue; continue;
snprintf(label, sizeof(label), "%s %s", buffer[player], bind->desc); snprintf(label, sizeof(label), "%s %s", buffer[player], keybind->desc);
snprintf(name, sizeof(name), "p%u_%s", player + 1, bind->base); snprintf(name, sizeof(name), "p%u_%s", player + 1, keybind->base);
CONFIG_BIND( CONFIG_BIND(
g_settings.input.binds[player][i], g_settings.input.binds[player][i],