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

Merge pull request #11238 from sonninnos/cheat-max-val

Browse Source 
Cheats maximum search value corrections
This commit is contained in:
Autechre 2020-08-25 01:14:28 +02:00 committed by GitHub
commit 7e74d830ca
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 30 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
managers/cheat_manager.c
View File

@ -1175,6 +1175,12 @@ int cheat_manager_search_eqminus(rarch_setting_t *setting, size_t idx, bool wrap
return cheat_manager_search(CHEAT_SEARCH_TYPE_EQMINUS); return cheat_manager_search(CHEAT_SEARCH_TYPE_EQMINUS);
} }
unsigned cheat_manager_get_state_search_size(unsigned search_size)
{
uint32_t n[] = {1,3,15,255,0x0000ffff,0xffffffff};
return n[search_size];
}
bool cheat_manager_add_new_code(unsigned int memory_search_size, unsigned int address, unsigned int address_mask, bool cheat_manager_add_new_code(unsigned int memory_search_size, unsigned int address, unsigned int address_mask,
bool big_endian, unsigned int value) bool big_endian, unsigned int value)
{ {

2
managers/cheat_manager.h
View File

@ -264,6 +264,8 @@ int cheat_manager_search_eqplus(rarch_setting_t *setting, size_t idx, bool wrapa
int cheat_manager_search_eqminus(rarch_setting_t *setting, size_t idx, bool wraparound); int cheat_manager_search_eqminus(rarch_setting_t *setting, size_t idx, bool wraparound);
unsigned cheat_manager_get_state_search_size(unsigned search_size);
int cheat_manager_add_matches(const char *path, int cheat_manager_add_matches(const char *path,
const char *label, unsigned type, size_t idx, size_t entry_idx); const char *label, unsigned type, size_t idx, size_t entry_idx);

10
menu/cbs/menu_cbs_ok.c
View File

@ -1193,10 +1193,10 @@ int generic_action_ok_displaylist_push(const char *path,
setting->max = cheat_manager_get_size()-1; setting->max = cheat_manager_get_size()-1;
setting = menu_setting_find_enum(MENU_ENUM_LABEL_CHEAT_VALUE); setting = menu_setting_find_enum(MENU_ENUM_LABEL_CHEAT_VALUE);
if (setting) if (setting)
setting->max = (int) pow(2,pow((double) 2,cheat_manager_state.working_cheat.memory_search_size))-1; setting->max = cheat_manager_get_state_search_size(cheat_manager_state.working_cheat.memory_search_size);
setting = menu_setting_find_enum(MENU_ENUM_LABEL_CHEAT_RUMBLE_VALUE); setting = menu_setting_find_enum(MENU_ENUM_LABEL_CHEAT_RUMBLE_VALUE);
if (setting) if (setting)
setting->max = (int) pow(2,pow((double) 2,cheat_manager_state.working_cheat.memory_search_size))-1; setting->max = cheat_manager_get_state_search_size(cheat_manager_state.working_cheat.memory_search_size);
setting = menu_setting_find_enum(MENU_ENUM_LABEL_CHEAT_ADDRESS_BIT_POSITION); setting = menu_setting_find_enum(MENU_ENUM_LABEL_CHEAT_ADDRESS_BIT_POSITION);
if (setting) if (setting)
{ {
@ -1215,13 +1215,13 @@ int generic_action_ok_displaylist_push(const char *path,
{ {
rarch_setting_t *setting = menu_setting_find_enum(MENU_ENUM_LABEL_CHEAT_SEARCH_EXACT); rarch_setting_t *setting = menu_setting_find_enum(MENU_ENUM_LABEL_CHEAT_SEARCH_EXACT);
if (setting) if (setting)
setting->max = (int) pow(2,pow((double) 2,cheat_manager_state.search_bit_size))-1; setting->max = cheat_manager_get_state_search_size(cheat_manager_state.search_bit_size);
setting = menu_setting_find_enum(MENU_ENUM_LABEL_CHEAT_SEARCH_EQPLUS); setting = menu_setting_find_enum(MENU_ENUM_LABEL_CHEAT_SEARCH_EQPLUS);
if (setting) if (setting)
setting->max = (int) pow(2,pow((double) 2,cheat_manager_state.search_bit_size))-1; setting->max = cheat_manager_get_state_search_size(cheat_manager_state.search_bit_size);
setting = menu_setting_find_enum(MENU_ENUM_LABEL_CHEAT_SEARCH_EQMINUS); setting = menu_setting_find_enum(MENU_ENUM_LABEL_CHEAT_SEARCH_EQMINUS);
if (setting) if (setting)
setting->max = (int) pow(2,pow((double) 2,cheat_manager_state.search_bit_size))-1; setting->max = cheat_manager_get_state_search_size(cheat_manager_state.search_bit_size);
ACTION_OK_DL_LBL(action_ok_dl_to_enum(action_type), DISPLAYLIST_GENERIC); ACTION_OK_DL_LBL(action_ok_dl_to_enum(action_type), DISPLAYLIST_GENERIC);
} }
#endif #endif

30
menu/menu_setting.c
View File

@ -7165,13 +7165,13 @@ static void general_write_handler(rarch_setting_t *setting)
if (setting) if (setting)
{ {
*(setting->value.target.unsigned_integer) = 0; *(setting->value.target.unsigned_integer) = 0;
setting->max = (int) pow(2,pow((double) 2,cheat_manager_state.working_cheat.memory_search_size))-1; setting->max = cheat_manager_get_state_search_size(cheat_manager_state.working_cheat.memory_search_size);
} }
setting = menu_setting_find_enum(MENU_ENUM_LABEL_CHEAT_RUMBLE_VALUE); setting = menu_setting_find_enum(MENU_ENUM_LABEL_CHEAT_RUMBLE_VALUE);
if (setting) if (setting)
{ {
*setting->value.target.unsigned_integer = 0; *setting->value.target.unsigned_integer = 0;
setting->max = (int) pow(2,pow((double) 2,cheat_manager_state.working_cheat.memory_search_size))-1; setting->max = cheat_manager_get_state_search_size(cheat_manager_state.working_cheat.memory_search_size);
} }
setting = menu_setting_find_enum(MENU_ENUM_LABEL_CHEAT_ADDRESS_BIT_POSITION); setting = menu_setting_find_enum(MENU_ENUM_LABEL_CHEAT_ADDRESS_BIT_POSITION);
if (setting) if (setting)
@ -7181,7 +7181,6 @@ static void general_write_handler(rarch_setting_t *setting)
max_bit_position = cheat_manager_state.working_cheat.memory_search_size<3 ? 255 : 0; max_bit_position = cheat_manager_state.working_cheat.memory_search_size<3 ? 255 : 0;
setting->max = max_bit_position; setting->max = max_bit_position;
} }
} }
#endif #endif
break; break;
@ -7192,21 +7191,20 @@ static void general_write_handler(rarch_setting_t *setting)
if (setting) if (setting)
{ {
*setting->value.target.unsigned_integer = 0; *setting->value.target.unsigned_integer = 0;
setting->max = (int) pow(2,pow((double) 2,cheat_manager_state.search_bit_size))-1; setting->max = cheat_manager_get_state_search_size(cheat_manager_state.search_bit_size);
} }
setting = menu_setting_find_enum(MENU_ENUM_LABEL_CHEAT_SEARCH_EQPLUS); setting = menu_setting_find_enum(MENU_ENUM_LABEL_CHEAT_SEARCH_EQPLUS);
if (setting) if (setting)
{ {
*setting->value.target.unsigned_integer = 0; *setting->value.target.unsigned_integer = 0;
setting->max = (int) pow(2,pow((double) 2,cheat_manager_state.search_bit_size))-1; setting->max = cheat_manager_get_state_search_size(cheat_manager_state.search_bit_size);
} }
setting = menu_setting_find_enum(MENU_ENUM_LABEL_CHEAT_SEARCH_EQMINUS); setting = menu_setting_find_enum(MENU_ENUM_LABEL_CHEAT_SEARCH_EQMINUS);
if (setting) if (setting)
{ {
*setting->value.target.unsigned_integer = 0; *setting->value.target.unsigned_integer = 0;
setting->max = (int) pow(2,pow((double) 2,cheat_manager_state.search_bit_size))-1; setting->max = cheat_manager_get_state_search_size(cheat_manager_state.search_bit_size);
} }
} }
#endif #endif
break; break;
@ -9569,12 +9567,14 @@ static bool setting_append_list(
CONFIG_UINT_CBS(cheat_manager_state.working_cheat.value, CHEAT_VALUE, CONFIG_UINT_CBS(cheat_manager_state.working_cheat.value, CHEAT_VALUE,
setting_uint_action_left_default,setting_uint_action_right_default, setting_uint_action_left_default,setting_uint_action_right_default,
0,&setting_get_string_representation_hex_and_uint,0,(int) pow(2,pow((double) 2,cheat_manager_state.working_cheat.memory_search_size))-1,1); 0,&setting_get_string_representation_hex_and_uint,
0,cheat_manager_get_state_search_size(cheat_manager_state.working_cheat.memory_search_size),1);
(*list)[list_info->index - 1].action_ok = &setting_action_ok_uint; (*list)[list_info->index - 1].action_ok = &setting_action_ok_uint;
CONFIG_UINT_CBS(cheat_manager_state.working_cheat.address, CHEAT_ADDRESS, CONFIG_UINT_CBS(cheat_manager_state.working_cheat.address, CHEAT_ADDRESS,
setting_uint_action_left_with_refresh,setting_uint_action_right_with_refresh, setting_uint_action_left_with_refresh,setting_uint_action_right_with_refresh,
0,&setting_get_string_representation_hex_and_uint,0,cheat_manager_state.total_memory_size==0?0:cheat_manager_state.total_memory_size-1,1); 0,&setting_get_string_representation_hex_and_uint,
0,cheat_manager_state.total_memory_size==0?0:cheat_manager_state.total_memory_size-1,1);
max_bit_position = cheat_manager_state.working_cheat.memory_search_size<3 ? 255 : 0; max_bit_position = cheat_manager_state.working_cheat.memory_search_size<3 ? 255 : 0;
CONFIG_UINT_CBS(cheat_manager_state.working_cheat.address_mask, CHEAT_ADDRESS_BIT_POSITION, CONFIG_UINT_CBS(cheat_manager_state.working_cheat.address_mask, CHEAT_ADDRESS_BIT_POSITION,
@ -9620,7 +9620,8 @@ static bool setting_append_list(
CONFIG_UINT_CBS(cheat_manager_state.working_cheat.rumble_value, CHEAT_RUMBLE_VALUE, CONFIG_UINT_CBS(cheat_manager_state.working_cheat.rumble_value, CHEAT_RUMBLE_VALUE,
setting_uint_action_left_default,setting_uint_action_right_default, setting_uint_action_left_default,setting_uint_action_right_default,
0,&setting_get_string_representation_hex_and_uint,0,(int) pow(2,pow((double) 2,cheat_manager_state.working_cheat.memory_search_size))-1,1); 0,&setting_get_string_representation_hex_and_uint,
0,cheat_manager_get_state_search_size(cheat_manager_state.working_cheat.memory_search_size),1);
(*list)[list_info->index - 1].action_ok = &setting_action_ok_uint; (*list)[list_info->index - 1].action_ok = &setting_action_ok_uint;
CONFIG_UINT_CBS(cheat_manager_state.working_cheat.rumble_port, CHEAT_RUMBLE_PORT, CONFIG_UINT_CBS(cheat_manager_state.working_cheat.rumble_port, CHEAT_RUMBLE_PORT,
@ -9697,7 +9698,8 @@ static bool setting_append_list(
parent_group, parent_group,
general_write_handler, general_write_handler,
general_read_handler); general_read_handler);
menu_settings_list_current_add_range(list, list_info, 0, (int) pow(2,pow((double) 2,cheat_manager_state.search_bit_size))-1, 1, true, true); menu_settings_list_current_add_range(list, list_info,
0, cheat_manager_get_state_search_size(cheat_manager_state.search_bit_size), 1, true, true);
(*list)[list_info->index - 1].get_string_representation = &setting_get_string_representation_uint_cheat_exact; (*list)[list_info->index - 1].get_string_representation = &setting_get_string_representation_uint_cheat_exact;
(*list)[list_info->index - 1].action_ok = &cheat_manager_search_exact; (*list)[list_info->index - 1].action_ok = &cheat_manager_search_exact;
@ -9796,7 +9798,8 @@ static bool setting_append_list(
parent_group, parent_group,
general_write_handler, general_write_handler,
general_read_handler); general_read_handler);
menu_settings_list_current_add_range(list, list_info, 0, (int) pow(2,pow((double) 2,cheat_manager_state.search_bit_size))-1, 1, true, true); menu_settings_list_current_add_range(list, list_info,
0, cheat_manager_get_state_search_size(cheat_manager_state.search_bit_size), 1, true, true);
(*list)[list_info->index - 1].get_string_representation = &setting_get_string_representation_uint_cheat_eqplus; (*list)[list_info->index - 1].get_string_representation = &setting_get_string_representation_uint_cheat_eqplus;
(*list)[list_info->index - 1].action_ok = &cheat_manager_search_eqplus; (*list)[list_info->index - 1].action_ok = &cheat_manager_search_eqplus;
@ -9811,7 +9814,8 @@ static bool setting_append_list(
parent_group, parent_group,
general_write_handler, general_write_handler,
general_read_handler); general_read_handler);
menu_settings_list_current_add_range(list, list_info, 0, (int) pow(2,pow((double) 2,cheat_manager_state.search_bit_size))-1, 1, true, true); menu_settings_list_current_add_range(list, list_info,
0, cheat_manager_get_state_search_size(cheat_manager_state.search_bit_size), 1, true, true);
(*list)[list_info->index - 1].get_string_representation = &setting_get_string_representation_uint_cheat_eqminus; (*list)[list_info->index - 1].get_string_representation = &setting_get_string_representation_uint_cheat_eqminus;
(*list)[list_info->index - 1].action_ok = &cheat_manager_search_eqminus; (*list)[list_info->index - 1].action_ok = &cheat_manager_search_eqminus;