mirror/RetroArch
1
0
Fork 0
mirror of https://github.com/libretro/RetroArch synced 2025-03-28 19:20:35 +00:00
Code Issues Packages Projects Releases Wiki Activity

(Menu) Fix savestate/loadstate settings in quickmenu

Browse Source
This commit is contained in:
twinaphex 2014-09-01 03:38:34 +02:00
parent 85fca42b42
commit 1a256399f1
2 changed files with 45 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

57
frontend/menu/backend/menu_common_backend.c
View File

@ -577,16 +577,36 @@ static int menu_common_setting_set_perf(unsigned setting, unsigned action,
static void menu_common_setting_set_current_boolean(rarch_setting_t *setting, unsigned action)
{
switch (action)
if (
!strcmp(setting->name, "savestate") ||
!strcmp(setting->name, "loadstate"))
{
case MENU_ACTION_OK:
case MENU_ACTION_LEFT:
case MENU_ACTION_RIGHT:
if (action == MENU_ACTION_START)
g_settings.state_slot = 0;
else if (action == MENU_ACTION_LEFT)
{
// Slot -1 is (auto) slot.
if (g_settings.state_slot >= 0)
g_settings.state_slot--;
}
else if (action == MENU_ACTION_RIGHT)
g_settings.state_slot++;
else if (action == MENU_ACTION_OK)
*setting->value.boolean = !(*setting->value.boolean);
break;
case MENU_ACTION_START:
*setting->value.boolean = setting->default_value.boolean;
break;
}
else
{
switch (action)
{
case MENU_ACTION_OK:
case MENU_ACTION_LEFT:
case MENU_ACTION_RIGHT:
*setting->value.boolean = !(*setting->value.boolean);
break;
case MENU_ACTION_START:
*setting->value.boolean = setting->default_value.boolean;
break;
}
}
if (setting->change_handler)
@ -914,27 +934,6 @@ static int menu_common_setting_set(unsigned id, unsigned action)
{
switch (id)
{
case MENU_SETTINGS_SAVESTATE_SAVE:
case MENU_SETTINGS_SAVESTATE_LOAD:
if (action == MENU_ACTION_OK)
{
if (id == MENU_SETTINGS_SAVESTATE_SAVE)
rarch_main_command(RARCH_CMD_SAVE_STATE);
else
rarch_main_command(RARCH_CMD_LOAD_STATE);
return -1;
}
else if (action == MENU_ACTION_START)
g_settings.state_slot = 0;
else if (action == MENU_ACTION_LEFT)
{
// Slot -1 is (auto) slot.
if (g_settings.state_slot >= 0)
g_settings.state_slot--;
}
else if (action == MENU_ACTION_RIGHT)
g_settings.state_slot++;
break;
case MENU_SETTINGS_DISK_INDEX:
{
int step = 0;

17
settings_data.c
View File

@ -1425,6 +1425,7 @@ static void general_write_handler(const void *data)
if (!setting)
return;
if (!strcmp(setting->name, "quit_retroarch"))
{
if (*setting->value.boolean)
@ -1658,6 +1659,22 @@ static void general_write_handler(const void *data)
g_settings.savestate_auto_load = *setting->value.boolean;
else if (!strcmp(setting->name, "savestate_auto_index"))
g_settings.savestate_auto_index = *setting->value.boolean;
else if (!strcmp(setting->name, "savestate"))
{
if (*setting->value.boolean)
{
rarch_cmd = RARCH_CMD_SAVE_STATE;
*setting->value.boolean = false;
}
}
else if (!strcmp(setting->name, "loadstate"))
{
if (*setting->value.boolean)
{
rarch_cmd = RARCH_CMD_LOAD_STATE;
*setting->value.boolean = false;
}
}
else if (!strcmp(setting->name, "slowmotion_ratio"))
g_settings.slowmotion_ratio = *setting->value.fraction;
else if (!strcmp(setting->name, "fastforward_ratio"))