ShuriZma
/
RetroArch
mirror of https://github.com/libretro/RetroArch.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Cleanups

This commit is contained in:
twinaphex 2015-02-01 10:08:14 +01:00
parent 3eb2699751
commit 8199411acb
2 changed files with 25 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
menu/menu_entries_cbs.c
View File

@ -4063,6 +4063,27 @@ static void menu_action_setting_disp_set_label_input_desc(
strlcpy(path_buf, path, path_buf_size); strlcpy(path_buf, path, path_buf_size);
} }
static void menu_action_setting_disp_set_label_cheat(
file_list_t* list,
unsigned *w, unsigned type, unsigned i,
const char *label,
char *type_str, size_t type_str_size,
const char *entry_label,
const char *path,
char *path_buf, size_t path_buf_size)
{
unsigned cheat_index = type - MENU_SETTINGS_CHEAT_BEGIN;
if (cheat_index < g_extern.cheat->buf_size)
snprintf(type_str, type_str_size, "%s : (%s)",
(g_extern.cheat->cheats[cheat_index].code != NULL)
? g_extern.cheat->cheats[cheat_index].code : "N/A",
g_extern.cheat->cheats[cheat_index].state ? "ON" : "OFF"
);
*w = 19;
strlcpy(path_buf, path, path_buf_size);
}
static void menu_action_setting_disp_set_label_menu_more( static void menu_action_setting_disp_set_label_menu_more(
file_list_t* list, file_list_t* list,
unsigned *w, unsigned type, unsigned i, unsigned *w, unsigned type, unsigned i,
@ -4888,10 +4909,12 @@ static void menu_entries_cbs_init_bind_get_string_representation(menu_file_list_
if (type >= MENU_SETTINGS_INPUT_DESC_BEGIN if (type >= MENU_SETTINGS_INPUT_DESC_BEGIN
&& type <= MENU_SETTINGS_INPUT_DESC_END) && type <= MENU_SETTINGS_INPUT_DESC_END)
{
cbs->action_get_representation = cbs->action_get_representation =
menu_action_setting_disp_set_label_input_desc; menu_action_setting_disp_set_label_input_desc;
} else if (type >= MENU_SETTINGS_CHEAT_BEGIN
&& type <= MENU_SETTINGS_CHEAT_END)
cbs->action_get_representation =
menu_action_setting_disp_set_label_cheat;
else else
{ {
switch (type) switch (type)

12
settings_data.c
View File

@ -2926,18 +2926,6 @@ void setting_data_get_label(void *data, char *type_str,
else if (!strcmp(label, "remap_file_load")) else if (!strcmp(label, "remap_file_load"))
fill_pathname_base(type_str, g_settings.input.remapping_path, fill_pathname_base(type_str, g_settings.input.remapping_path,
type_str_size); type_str_size);
else if (type >= MENU_SETTINGS_CHEAT_BEGIN
&& type <= MENU_SETTINGS_CHEAT_END)
{
unsigned cheat_index = type - MENU_SETTINGS_CHEAT_BEGIN;
if (cheat_index < g_extern.cheat->buf_size)
snprintf(type_str, type_str_size, "%s : (%s)",
(g_extern.cheat->cheats[cheat_index].code != NULL)
? g_extern.cheat->cheats[cheat_index].code : "N/A",
g_extern.cheat->cheats[cheat_index].state ? "ON" : "OFF"
);
}
else if (type >= MENU_SETTINGS_PERF_COUNTERS_BEGIN else if (type >= MENU_SETTINGS_PERF_COUNTERS_BEGIN
&& type <= MENU_SETTINGS_PERF_COUNTERS_END) && type <= MENU_SETTINGS_PERF_COUNTERS_END)
menu_common_setting_set_label_perf(type_str, type_str_size, w, type, menu_common_setting_set_label_perf(type_str, type_str_size, w, type,