Qubot/retro-go
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

rg_gui: removed unused arg to rg_gui_savestate_menu

Browse Source
This commit is contained in:
Alex Duchesne 2024-12-03 15:04:26 -05:00
parent 7b3c5374aa
commit cc8751fe44
3 changed files with 13 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
components/retro-go/rg_gui.c
View File

@ -1757,9 +1757,9 @@ void rg_gui_debug_menu(const rg_gui_option_t *extra_options)
static rg_gui_event_t slot_select_cb(rg_gui_option_t *option, rg_gui_event_t event)
{
rg_emu_slot_t *slot = (rg_emu_slot_t *)option->arg;
if (event == RG_DIALOG_FOCUS_GAINED)
{
rg_emu_slot_t *slot = (rg_emu_slot_t *)option->arg;
rg_image_t *preview = NULL;
rg_color_t color = C_BLUE;
size_t margin = 0; // TEXT_RECT("ABC", 0).height;
@ -1792,10 +1792,9 @@ static rg_gui_event_t slot_select_cb(rg_gui_option_t *option, rg_gui_event_t eve
#undef draw_status
}
int rg_gui_savestate_menu(const char *title, const char *rom_path, bool quick_return)
int rg_gui_savestate_menu(const char *title, const char *rom_path)
{
const rg_app_t *app = rg_system_get_app();
rg_emu_states_t *savestates = rg_emu_get_states(rom_path ?: app->romPath, 4);
rg_emu_states_t *savestates = rg_emu_get_states(rom_path, 4);
const rg_gui_option_t choices[] = {
{(intptr_t)&savestates->slots[0], _("Slot 0"), NULL, RG_DIALOG_FLAG_NORMAL, &slot_select_cb},
{(intptr_t)&savestates->slots[1], _("Slot 1"), NULL, RG_DIALOG_FLAG_NORMAL, &slot_select_cb},
@ -1803,26 +1802,16 @@ int rg_gui_savestate_menu(const char *title, const char *rom_path, bool quick_re
{(intptr_t)&savestates->slots[3], _("Slot 3"), NULL, RG_DIALOG_FLAG_NORMAL, &slot_select_cb},
RG_DIALOG_END
};
int sel = 0;
if (!rom_path)
sel = app->saveSlot;
else if (savestates->lastused)
sel = savestates->lastused->id;
intptr_t ret = rg_gui_dialog(title, choices, sel);
if (ret && ret != RG_DIALOG_CANCELLED)
sel = ((rg_emu_slot_t *)ret)->id;
else
sel = -1;
intptr_t ret = rg_gui_dialog(title, choices, savestates->lastused ? savestates->lastused->id : 0);
int slot = (ret == RG_DIALOG_CANCELLED) ? -1 : ((rg_emu_slot_t *)ret)->id;
free(savestates);
return sel;
return slot;
}
void rg_gui_game_menu(void)
{
const char *rom_path = rg_system_get_app()->romPath;
bool have_option_btn = rg_input_get_key_mapping(RG_KEY_OPTION);
const rg_gui_option_t choices[] = {
{1000, _("Save & Continue"), NULL, RG_DIALOG_FLAG_NORMAL, NULL},
@ -1857,9 +1846,9 @@ void rg_gui_game_menu(void)
switch (sel)
{
case 1000: if ((slot = rg_gui_savestate_menu("Save", 0, 0)) >= 0) rg_emu_save_state(slot); break;
case 2000: if ((slot = rg_gui_savestate_menu("Save", 0, 0)) >= 0 && rg_emu_save_state(slot)) rg_system_exit(); break;
case 3001: if ((slot = rg_gui_savestate_menu("Load", 0, 0)) >= 0) rg_emu_load_state(slot); break;
case 1000: if ((slot = rg_gui_savestate_menu(_("Save"), rom_path)) >= 0) rg_emu_save_state(slot); break;
case 2000: if ((slot = rg_gui_savestate_menu(_("Save"), rom_path)) >= 0 && rg_emu_save_state(slot)) rg_system_exit(); break;
case 3001: if ((slot = rg_gui_savestate_menu(_("Load"), rom_path)) >= 0) rg_emu_load_state(slot); break;
case 3002: rg_emu_reset(false); break;
case 3003: rg_emu_reset(true); break;
#ifdef RG_ENABLE_NETPLAY

2
components/retro-go/rg_gui.h
View File

@ -121,7 +121,7 @@ void rg_gui_alert(const char *title, const char *message);
char *rg_gui_file_picker(const char *title, const char *path, bool (*validator)(const char *path), bool none_option);
char *rg_gui_prompt(const char *title, const char *message, const char *default_value);
int rg_gui_savestate_menu(const char *title, const char *rom_path, bool quick_return);
int rg_gui_savestate_menu(const char *title, const char *rom_path);
void rg_gui_options_menu(void);
void rg_gui_game_menu(void);
void rg_gui_about_menu(const rg_gui_option_t *extra_options);

4
launcher/main/applications.c
View File

@ -609,7 +609,7 @@ void application_show_file_menu(retro_file_t *file, bool advanced)
switch (sel)
{
case 0:
if ((slot = rg_gui_savestate_menu(_("Resume"), rom_path, 1)) == -1)
if ((slot = rg_gui_savestate_menu(_("Resume"), rom_path)) == -1)
break;
/* fallthrough */
case 1:
@ -619,7 +619,7 @@ void application_show_file_menu(retro_file_t *file, bool advanced)
break;
case 2:
while ((slot = rg_gui_savestate_menu(_("Delete save?"), rom_path, 0)) != -1)
while ((slot = rg_gui_savestate_menu(_("Delete save?"), rom_path)) != -1)
{
remove(savestates->slots[slot].preview);
remove(savestates->slots[slot].file);