mirror/RetroArch
1
0
Fork 0
mirror of https://github.com/libretro/RetroArch synced 2025-02-06 00:39:53 +00:00
Code Issues Packages Projects Releases Wiki Activity

Reduce references to global->cheat

Browse Source
This commit is contained in:
twinaphex 2015-12-01 02:55:07 +01:00
parent 8efb57f4bf
commit 39b8971fae
7 changed files with 23 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
cheats.c
View File

@ -61,8 +61,10 @@ unsigned cheat_manager_get_buf_size(void)
return handle->buf_size;
}
unsigned cheat_manager_get_size(cheat_manager_t *handle)
unsigned cheat_manager_get_size(void)
{
global_t *global = global_get_ptr();
cheat_manager_t *handle = global->cheat;
if (!handle)
return 0;
return handle->size;
@ -91,8 +93,10 @@ void cheat_manager_apply_cheats(void)
#endif
}
void cheat_manager_set_code(cheat_manager_t *handle, unsigned i, const char *str)
void cheat_manager_set_code(unsigned i, const char *str)
{
global_t *global = global_get_ptr();
cheat_manager_t *handle = global->cheat;
if (!handle)
return;
handle->cheats[i].code = strdup(str);
@ -248,9 +252,11 @@ cheat_manager_t *cheat_manager_new(unsigned size)
return handle;
}
bool cheat_manager_realloc(cheat_manager_t *handle, unsigned new_size)
bool cheat_manager_realloc(unsigned new_size)
{
unsigned i;
global_t *global = global_get_ptr();
cheat_manager_t *handle = global->cheat;
if (!handle)
return false;

6
cheats.h
View File

@ -25,7 +25,7 @@ extern "C" {
typedef struct cheat_manager cheat_manager_t;
unsigned cheat_manager_get_size(cheat_manager_t *handle);
unsigned cheat_manager_get_size(void);
cheat_manager_t *cheat_manager_new(unsigned size);
@ -41,9 +41,9 @@ cheat_manager_t *cheat_manager_load(const char *path);
**/
bool cheat_manager_save(const char *path);
bool cheat_manager_realloc(cheat_manager_t *handle, unsigned new_size);
bool cheat_manager_realloc(unsigned new_size);
void cheat_manager_set_code(cheat_manager_t *handle, unsigned index, const char *str);
void cheat_manager_set_code(unsigned index, const char *str);
void cheat_manager_free(cheat_manager_t *handle);

11
menu/cbs/menu_cbs_left.c
View File

@ -238,18 +238,13 @@ static int action_left_cheat_num_passes(unsigned type, const char *label,
bool wraparound)
{
unsigned new_size = 0;
global_t *global = global_get_ptr();
menu_handle_t *menu = menu_driver_get_ptr();
cheat_manager_t *cheat = global->cheat;
if (!cheat)
return -1;
if (cheat_manager_get_size(cheat))
new_size = cheat_manager_get_size(cheat) - 1;
if (cheat_manager_get_size())
new_size = cheat_manager_get_size() - 1;
menu_entries_set_refresh(false);
menu->prevent_populate = true;
cheat_manager_realloc(cheat, new_size);
cheat_manager_realloc(new_size);
return 0;
}

9
menu/cbs/menu_cbs_right.c
View File

@ -263,17 +263,12 @@ static int action_right_cheat_num_passes(unsigned type, const char *label,
bool wraparound)
{
unsigned new_size = 0;
global_t *global = global_get_ptr();
menu_handle_t *menu = menu_driver_get_ptr();
cheat_manager_t *cheat = global->cheat;
if (!cheat)
return -1;
new_size = cheat_manager_get_size(cheat) + 1;
new_size = cheat_manager_get_size() + 1;
menu_entries_set_refresh(false);
menu->prevent_populate = true;
cheat_manager_realloc(cheat, new_size);
cheat_manager_realloc(new_size);
return 0;
}

10
menu/cbs/menu_cbs_start.c
View File

@ -239,16 +239,10 @@ static int action_start_shader_num_passes(unsigned type, const char *label)
static int action_start_cheat_num_passes(unsigned type, const char *label)
{
global_t *global = global_get_ptr();
cheat_manager_t *cheat = global->cheat;
if (!cheat)
return -1;
if (cheat_manager_get_size(cheat))
if (cheat_manager_get_size())
{
menu_entries_set_refresh(false);
cheat_manager_realloc(cheat, 0);
cheat_manager_realloc(0);
}
return 0;

2
menu/menu_displaylist.c
View File

@ -2000,7 +2000,7 @@ static int menu_displaylist_parse_options_cheats(menu_displaylist_info_t *info)
menu_hash_to_str(MENU_LABEL_CHEAT_APPLY_CHANGES),
MENU_SETTING_ACTION, 0, 0);
for (i = 0; i < cheat_manager_get_size(cheat); i++)
for (i = 0; i < cheat_manager_get_size(); i++)
{
char cheat_label[64] = {0};

8
menu/menu_input.c
View File

@ -404,19 +404,17 @@ void menu_input_st_string_callback(void *userdata, const char *str)
void menu_input_st_cheat_callback(void *userdata, const char *str)
{
global_t *global = global_get_ptr();
cheat_manager_t *cheat = global ? global->cheat : NULL;
menu_input_t *menu_input = menu_input_get_ptr();
(void)userdata;
if (!menu_input || !cheat)
if (!menu_input)
return;
if (cheat && str && *str)
if (str && *str)
{
unsigned cheat_index = menu_input->keyboard.type - MENU_SETTINGS_CHEAT_BEGIN;
cheat_manager_set_code(cheat, cheat_index, str);
cheat_manager_set_code(cheat_index, str);
}
menu_input_key_end_line();