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

Merge pull request #3873 from lasers/fix-cheats 

Improve cheat menu + wording
This commit is contained in:
Twinaphex 2016-10-27 20:07:12 +02:00 committed by GitHub
parent 4fb6808321 0a637cf5e4
commit d00d62a228
3 changed files with 17 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
intl/msg_hash_us.c
View File

@ -626,7 +626,7 @@ int menu_hash_get_help_us_enum(enum msg_hash_enums msg, char *s, size_t len)
{ {
/* Work around C89 limitations */ /* Work around C89 limitations */
char u[501]; char u[501];
const char * t = const char * t =
"RetroArch relies on an unique form of\n" "RetroArch relies on an unique form of\n"
"audio/video synchronization where it needs to be\n" "audio/video synchronization where it needs to be\n"
"calibrated against the refresh rate of your\n" "calibrated against the refresh rate of your\n"
@ -4172,9 +4172,9 @@ const char *msg_hash_to_str_us(enum msg_hash_enums msg)
case MENU_ENUM_LABEL_VALUE_CHEAT_FILE: case MENU_ENUM_LABEL_VALUE_CHEAT_FILE:
return "Cheat File"; return "Cheat File";
case MENU_ENUM_LABEL_VALUE_CHEAT_FILE_LOAD: case MENU_ENUM_LABEL_VALUE_CHEAT_FILE_LOAD:
return "Cheat File Load"; return "Load Cheat File";
case MENU_ENUM_LABEL_VALUE_CHEAT_FILE_SAVE_AS: case MENU_ENUM_LABEL_VALUE_CHEAT_FILE_SAVE_AS:
return "Cheat File Save As"; return "Save Cheat File As";
case MENU_ENUM_LABEL_VALUE_CORE_COUNTERS: case MENU_ENUM_LABEL_VALUE_CORE_COUNTERS:
return "Core Counters"; return "Core Counters";
case MENU_ENUM_LABEL_VALUE_TAKE_SCREENSHOT: case MENU_ENUM_LABEL_VALUE_TAKE_SCREENSHOT:

10
managers/cheat_manager.c
View File

@ -1,7 +1,7 @@
/* RetroArch - A frontend for libretro. /* RetroArch - A frontend for libretro.
* Copyright (C) 2010-2014 - Hans-Kristian Arntzen * Copyright (C) 2010-2014 - Hans-Kristian Arntzen
* Copyright (C) 2011-2016 - Daniel De Matteis * Copyright (C) 2011-2016 - Daniel De Matteis
* *
* RetroArch is free software: you can redistribute it and/or modify it under the terms * RetroArch is free software: you can redistribute it and/or modify it under the terms
* of the GNU General Public License as published by the Free Software Found- * of the GNU General Public License as published by the Free Software Found-
* ation, either version 3 of the License, or (at your option) any later version. * ation, either version 3 of the License, or (at your option) any later version.
@ -97,7 +97,9 @@ void cheat_manager_apply_cheats(void)
core_set_cheat(&cheat_info); core_set_cheat(&cheat_info);
} }
} }
runloop_msg_queue_push("Applying cheat changes.", 1, 180, true);
RARCH_LOG("Applying cheat changes.\n");
#ifdef HAVE_CHEEVOS #ifdef HAVE_CHEEVOS
data_bool = idx != 0; data_bool = idx != 0;
cheevos_apply_cheats(&data_bool); cheevos_apply_cheats(&data_bool);
@ -137,7 +139,7 @@ bool cheat_manager_save(const char *path)
path, sizeof(buf)); path, sizeof(buf));
fill_pathname_noext(cheats_file, buf, ".cht", sizeof(cheats_file)); fill_pathname_noext(cheats_file, buf, ".cht", sizeof(cheats_file));
conf = config_file_new(cheats_file); conf = config_file_new(cheats_file);
if (!conf) if (!conf)
@ -340,7 +342,7 @@ void cheat_manager_update(cheat_manager_t *handle, unsigned handle_idx)
snprintf(msg, sizeof(msg), "Cheat: #%u [%s]: %s", snprintf(msg, sizeof(msg), "Cheat: #%u [%s]: %s",
handle_idx, handle->cheats[handle_idx].state ? "ON" : "OFF", handle_idx, handle->cheats[handle_idx].state ? "ON" : "OFF",
(handle->cheats[handle_idx].desc) ? (handle->cheats[handle_idx].desc) ?
(handle->cheats[handle_idx].desc) : (handle->cheats[handle_idx].code) (handle->cheats[handle_idx].desc) : (handle->cheats[handle_idx].code)
); );
runloop_msg_queue_push(msg, 1, 180, true); runloop_msg_queue_push(msg, 1, 180, true);

16
menu/menu_displaylist.c
View File

@ -2724,19 +2724,19 @@ static int menu_displaylist_parse_load_content_settings(
MENU_ENUM_LABEL_SHADER_OPTIONS, MENU_ENUM_LABEL_SHADER_OPTIONS,
MENU_SETTING_ACTION, 0, 0); MENU_SETTING_ACTION, 0, 0);
#endif #endif
menu_entries_append_enum(info->list, menu_entries_append_enum(info->list,
msg_hash_to_str(MENU_ENUM_LABEL_VALUE_SAVE_CURRENT_CONFIG_OVERRIDE_CORE), msg_hash_to_str(MENU_ENUM_LABEL_VALUE_SAVE_CURRENT_CONFIG_OVERRIDE_CORE),
msg_hash_to_str(MENU_ENUM_LABEL_SAVE_CURRENT_CONFIG_OVERRIDE_CORE), msg_hash_to_str(MENU_ENUM_LABEL_SAVE_CURRENT_CONFIG_OVERRIDE_CORE),
MENU_ENUM_LABEL_SAVE_CURRENT_CONFIG_OVERRIDE_CORE, MENU_ENUM_LABEL_SAVE_CURRENT_CONFIG_OVERRIDE_CORE,
MENU_SETTING_ACTION, 0, 0); MENU_SETTING_ACTION, 0, 0);
menu_entries_append_enum(info->list, menu_entries_append_enum(info->list,
msg_hash_to_str(MENU_ENUM_LABEL_VALUE_SAVE_CURRENT_CONFIG_OVERRIDE_GAME), msg_hash_to_str(MENU_ENUM_LABEL_VALUE_SAVE_CURRENT_CONFIG_OVERRIDE_GAME),
msg_hash_to_str(MENU_ENUM_LABEL_SAVE_CURRENT_CONFIG_OVERRIDE_GAME), msg_hash_to_str(MENU_ENUM_LABEL_SAVE_CURRENT_CONFIG_OVERRIDE_GAME),
MENU_ENUM_LABEL_SAVE_CURRENT_CONFIG_OVERRIDE_GAME, MENU_ENUM_LABEL_SAVE_CURRENT_CONFIG_OVERRIDE_GAME,
MENU_SETTING_ACTION, 0, 0); MENU_SETTING_ACTION, 0, 0);
#ifdef HAVE_CHEEVOS #ifdef HAVE_CHEEVOS
if(settings->cheevos.enable) if(settings->cheevos.enable)
menu_entries_append_enum(info->list, menu_entries_append_enum(info->list,
@ -3040,6 +3040,11 @@ static int menu_displaylist_parse_options_cheats(
if (!cheat_manager_alloc_if_empty()) if (!cheat_manager_alloc_if_empty())
return -1; return -1;
menu_entries_append_enum(info->list,
msg_hash_to_str(MENU_ENUM_LABEL_VALUE_CHEAT_APPLY_CHANGES),
msg_hash_to_str(MENU_ENUM_LABEL_CHEAT_APPLY_CHANGES),
MENU_ENUM_LABEL_CHEAT_APPLY_CHANGES,
MENU_SETTING_ACTION, 0, 0);
menu_entries_append_enum(info->list, menu_entries_append_enum(info->list,
msg_hash_to_str(MENU_ENUM_LABEL_VALUE_CHEAT_FILE_LOAD), msg_hash_to_str(MENU_ENUM_LABEL_VALUE_CHEAT_FILE_LOAD),
msg_hash_to_str(MENU_ENUM_LABEL_CHEAT_FILE_LOAD), msg_hash_to_str(MENU_ENUM_LABEL_CHEAT_FILE_LOAD),
@ -3055,11 +3060,6 @@ static int menu_displaylist_parse_options_cheats(
msg_hash_to_str(MENU_ENUM_LABEL_CHEAT_NUM_PASSES), msg_hash_to_str(MENU_ENUM_LABEL_CHEAT_NUM_PASSES),
MENU_ENUM_LABEL_CHEAT_NUM_PASSES, MENU_ENUM_LABEL_CHEAT_NUM_PASSES,
0, 0, 0); 0, 0, 0);
menu_entries_append_enum(info->list,
msg_hash_to_str(MENU_ENUM_LABEL_VALUE_CHEAT_APPLY_CHANGES),
msg_hash_to_str(MENU_ENUM_LABEL_CHEAT_APPLY_CHANGES),
MENU_ENUM_LABEL_CHEAT_APPLY_CHANGES,
MENU_SETTING_ACTION, 0, 0);
for (i = 0; i < cheat_manager_get_size(); i++) for (i = 0; i < cheat_manager_get_size(); i++)
{ {