diff --git a/cheats.c b/cheats.c index 0c4e479e85..5e0aec79bb 100644 --- a/cheats.c +++ b/cheats.c @@ -360,8 +360,10 @@ void cheat_manager_index_prev(cheat_manager_t *handle) cheat_manager_update(handle, handle->ptr); } -const char *cheat_manager_get_code(cheat_manager_t *handle, unsigned i) +const char *cheat_manager_get_code(unsigned i) { + global_t *global = global_get_ptr(); + cheat_manager_t *handle = global->cheat; if (!handle) return NULL; return handle->cheats[i].code; @@ -374,8 +376,10 @@ const char *cheat_manager_get_desc(cheat_manager_t *handle, unsigned i) return handle->cheats[i].desc; } -bool cheat_manager_get_code_state(cheat_manager_t *handle, unsigned i) +bool cheat_manager_get_code_state(unsigned i) { + global_t *global = global_get_ptr(); + cheat_manager_t *handle = global->cheat; if (!handle) return false; return handle->cheats[i].state; diff --git a/cheats.h b/cheats.h index eb2244749b..163c572dfb 100644 --- a/cheats.h +++ b/cheats.h @@ -63,9 +63,9 @@ unsigned cheat_manager_get_buf_size(void); const char *cheat_manager_get_desc(cheat_manager_t *handle, unsigned i); -const char *cheat_manager_get_code(cheat_manager_t *handle, unsigned i); +const char *cheat_manager_get_code(unsigned i); -bool cheat_manager_get_code_state(cheat_manager_t *handle, unsigned i); +bool cheat_manager_get_code_state(unsigned i); void cheat_manager_state_checks( bool cheat_index_plus_pressed, diff --git a/menu/cbs/menu_cbs_get_value.c b/menu/cbs/menu_cbs_get_value.c index d59a7b940b..282a604799 100644 --- a/menu/cbs/menu_cbs_get_value.c +++ b/menu/cbs/menu_cbs_get_value.c @@ -405,18 +405,14 @@ static void menu_action_setting_disp_set_label_cheat( const char *path, char *s2, size_t len2) { - global_t *global = global_get_ptr(); unsigned cheat_index = type - MENU_SETTINGS_CHEAT_BEGIN; - if (!global) - return; - if (cheat_index < cheat_manager_get_buf_size()) snprintf(s, len, "%s : (%s)", - (cheat_manager_get_code(global->cheat, cheat_index) != NULL) - ? cheat_manager_get_code(global->cheat, cheat_index) : + (cheat_manager_get_code(cheat_index) != NULL) + ? cheat_manager_get_code(cheat_index) : menu_hash_to_str(MENU_VALUE_NOT_AVAILABLE), - cheat_manager_get_code_state(global->cheat, cheat_index) ? + cheat_manager_get_code_state(cheat_index) ? menu_hash_to_str(MENU_VALUE_ON) : menu_hash_to_str(MENU_VALUE_OFF) );