mvietri/union-minui
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

show loaded config on save item in main menu too

Browse source
This commit is contained in:
Shaun Inman 2023-01-28 19:52:18 -05:00
parent 515aa13b60
commit 0edeaf06eb
8 changed files with 16 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

10
src/minarch/main.c
View file

@ -2694,7 +2694,9 @@ static MenuList options_save_menu = {
{NULL}, {NULL},
} }
}; };
static void update_save_option_desc(void);
static int options_save_open(MenuList* list, int i) { static int options_save_open(MenuList* list, int i) {
update_save_option_desc();
options_save_menu.desc = getSaveDesc(); options_save_menu.desc = getSaveDesc();
Menu_options(&options_save_menu); Menu_options(&options_save_menu);
return MENU_CALLBACK_NOP; return MENU_CALLBACK_NOP;
@ -2712,6 +2714,10 @@ static MenuList options_menu = {
} }
}; };
static void update_save_option_desc(void) {
options_menu.items[4].desc = getSaveDesc();
}
static int Menu_options(MenuList* list) { static int Menu_options(MenuList* list) {
MenuItem* items = list->items; MenuItem* items = list->items;
int type = list->type; int type = list->type;
@ -2726,7 +2732,9 @@ static int Menu_options(MenuList* list) {
int start = 0; int start = 0;
int end = MIN(count,MAX_VISIBLE_OPTIONS); int end = MIN(count,MAX_VISIBLE_OPTIONS);
int visible_rows = end; int visible_rows = end;
update_save_option_desc();
while (show_options) { while (show_options) {
if (await_input) { if (await_input) {
list->on_confirm(list, selected); list->on_confirm(list, selected);

2
src/minarch/overrides/fceumm.h
View file

@ -22,7 +22,7 @@ static CoreOverrides fceumm_overrides = {
{"Change Disk", RETRO_DEVICE_ID_JOYPAD_L, BTN_ID_NONE}, {"Change Disk", RETRO_DEVICE_ID_JOYPAD_L, BTN_ID_NONE},
{"Insert Disk", RETRO_DEVICE_ID_JOYPAD_R, BTN_ID_NONE}, {"Insert Disk", RETRO_DEVICE_ID_JOYPAD_R, BTN_ID_NONE},
{"Insert Coin", RETRO_DEVICE_ID_JOYPAD_R2, BTN_ID_NONE}, {"Insert Coin", RETRO_DEVICE_ID_JOYPAD_R2, BTN_ID_NONE},
{NULL,0,0}, {NULL},
}, },
}; };

2
src/minarch/overrides/gambatte.h
View file

@ -22,6 +22,6 @@ CoreOverrides gambatte_overrides = {
{"B Turbo", RETRO_DEVICE_ID_JOYPAD_Y, BTN_ID_NONE}, {"B Turbo", RETRO_DEVICE_ID_JOYPAD_Y, BTN_ID_NONE},
{"Prev. Palette", RETRO_DEVICE_ID_JOYPAD_L, BTN_ID_NONE}, {"Prev. Palette", RETRO_DEVICE_ID_JOYPAD_L, BTN_ID_NONE},
{"Next Palette", RETRO_DEVICE_ID_JOYPAD_R, BTN_ID_NONE}, {"Next Palette", RETRO_DEVICE_ID_JOYPAD_R, BTN_ID_NONE},
{NULL,0,0}, {NULL},
}, },
}; };

2
src/minarch/overrides/gpsp.h
View file

@ -19,6 +19,6 @@ static CoreOverrides gpsp_overrides = {
{"B Turbo", RETRO_DEVICE_ID_JOYPAD_Y, BTN_ID_NONE}, {"B Turbo", RETRO_DEVICE_ID_JOYPAD_Y, BTN_ID_NONE},
{"L Button", RETRO_DEVICE_ID_JOYPAD_L, BTN_ID_L1}, {"L Button", RETRO_DEVICE_ID_JOYPAD_L, BTN_ID_L1},
{"R Button", RETRO_DEVICE_ID_JOYPAD_R, BTN_ID_R1}, {"R Button", RETRO_DEVICE_ID_JOYPAD_R, BTN_ID_R1},
{NULL,0,0}, {NULL},
}, },
}; };

2
src/minarch/overrides/pcsx_rearmed.h
View file

@ -17,6 +17,6 @@ static CoreOverrides pcsx_rearmed_overrides = {
{"R1 Button", RETRO_DEVICE_ID_JOYPAD_R, BTN_ID_R1}, {"R1 Button", RETRO_DEVICE_ID_JOYPAD_R, BTN_ID_R1},
{"L2 Button", RETRO_DEVICE_ID_JOYPAD_L2, BTN_ID_L2}, {"L2 Button", RETRO_DEVICE_ID_JOYPAD_L2, BTN_ID_L2},
{"R2 Button", RETRO_DEVICE_ID_JOYPAD_R2, BTN_ID_R2}, {"R2 Button", RETRO_DEVICE_ID_JOYPAD_R2, BTN_ID_R2},
{NULL,0,0}, {NULL},
}, },
}; };

2
src/minarch/overrides/picodrive.h
View file

@ -19,6 +19,6 @@ static CoreOverrides picodrive_overrides = {
{"X Button", RETRO_DEVICE_ID_JOYPAD_L, BTN_ID_B}, {"X Button", RETRO_DEVICE_ID_JOYPAD_L, BTN_ID_B},
{"Y Button", RETRO_DEVICE_ID_JOYPAD_X, BTN_ID_L1}, {"Y Button", RETRO_DEVICE_ID_JOYPAD_X, BTN_ID_L1},
{"Z Button", RETRO_DEVICE_ID_JOYPAD_R, BTN_ID_R1}, {"Z Button", RETRO_DEVICE_ID_JOYPAD_R, BTN_ID_R1},
{NULL,0,0}, {NULL},
}, },
}; };

2
src/minarch/overrides/pokemini.h
View file

@ -20,6 +20,6 @@ static CoreOverrides pokemini_overrides = {
{"C Button", RETRO_DEVICE_ID_JOYPAD_R, BTN_ID_R1}, {"C Button", RETRO_DEVICE_ID_JOYPAD_R, BTN_ID_R1},
{"Shake", RETRO_DEVICE_ID_JOYPAD_L, BTN_ID_L1}, {"Shake", RETRO_DEVICE_ID_JOYPAD_L, BTN_ID_L1},
{"Power", RETRO_DEVICE_ID_JOYPAD_SELECT, BTN_ID_SELECT}, {"Power", RETRO_DEVICE_ID_JOYPAD_SELECT, BTN_ID_SELECT},
{NULL,0,0}, {NULL},
}, },
}; };

2
src/minarch/overrides/snes9x2005_plus.h
View file

@ -15,6 +15,6 @@ static CoreOverrides snes9x2005_plus_overrides = {
{"A Button", RETRO_DEVICE_ID_JOYPAD_A, BTN_ID_A}, {"A Button", RETRO_DEVICE_ID_JOYPAD_A, BTN_ID_A},
{"L Button", RETRO_DEVICE_ID_JOYPAD_L, BTN_ID_L1}, {"L Button", RETRO_DEVICE_ID_JOYPAD_L, BTN_ID_L1},
{"R Button", RETRO_DEVICE_ID_JOYPAD_R, BTN_ID_R1}, {"R Button", RETRO_DEVICE_ID_JOYPAD_R, BTN_ID_R1},
{NULL,0,0}, {NULL},
}, },
}; };