frontend: simplify config handling

[picodrive.git] / platform / common / menu_pico.c

diff --git a/platform/common/menu_pico.c b/platform/common/menu_pico.c
index 90d058a..2dd582d 100644 (file)
--- a/platform/common/menu_pico.c
+++ b/platform/common/menu_pico.c
@@ -11,8 +11,7 @@
 #include "emu.h"
 #include "menu_pico.h"
 #include "input_pico.h"
-
-#include <version.h>
+#include "version.h"
 
 #include <pico/pico.h>
 #include <pico/patch.h>
@@ -28,7 +27,7 @@
 
 static const char *rom_exts[] = {
        "zip",
-       "bin", "smd", "gen",
+       "bin", "smd", "gen", "md",
        "iso", "cso", "cue",
        "32x",
        "sms",
@@ -38,11 +37,16 @@ static const char *rom_exts[] = {
 // rrrr rggg gggb bbbb
 static unsigned short fname2color(const char *fname)
 {
-       const char *ext = fname + strlen(fname) - 3;
        static const char *other_exts[] = { "gmv", "pat" };
+       const char *ext;
        int i;
 
-       if (ext < fname) ext = fname;
+       ext = strrchr(fname, '.');
+       if (ext++ == NULL) {
+               ext = fname + strlen(fname) - 3;
+               if (ext < fname) ext = fname;
+       }
+
        for (i = 0; rom_exts[i] != NULL; i++)
                if (strcasecmp(ext, rom_exts[i]) == 0) return 0xbdff; // FIXME: mk defines
        for (i = 0; i < array_size(other_exts); i++)
@@ -372,7 +376,7 @@ static int menu_loop_keyconfig(int id, int keys)
 {
        static int sel = 0;
 
-       me_enable(e_menu_keyconfig, MA_OPT_SAVECFG_GAME, rom_loaded);
+       me_enable(e_menu_keyconfig, MA_OPT_SAVECFG_GAME, PicoGameLoaded);
        me_loop(e_menu_keyconfig, &sel);
        return 0;
 }
@@ -737,7 +741,7 @@ static int menu_loop_options(int id, int keys)
 
        i = me_id2offset(e_menu_options, MA_OPT_CPU_CLOCKS);
        e_menu_options[i].enabled = e_menu_options[i].name[0] ? 1 : 0;
-       me_enable(e_menu_options, MA_OPT_SAVECFG_GAME, rom_loaded);
+       me_enable(e_menu_options, MA_OPT_SAVECFG_GAME, PicoGameLoaded);
        me_enable(e_menu_options, MA_OPT_LOADCFG, config_slot != config_slot_current);
 
        me_loop(e_menu_options, &sel);
@@ -928,19 +932,19 @@ static int main_menu_handler(int id, int keys)
        switch (id)
        {
        case MA_MAIN_RESUME_GAME:
-               if (rom_loaded)
+               if (PicoGameLoaded)
                        return 1;
                break;
        case MA_MAIN_SAVE_STATE:
-               if (rom_loaded)
+               if (PicoGameLoaded)
                        return menu_loop_savestate(0);
                break;
        case MA_MAIN_LOAD_STATE:
-               if (rom_loaded)
+               if (PicoGameLoaded)
                        return menu_loop_savestate(1);
                break;
        case MA_MAIN_RESET_GAME:
-               if (rom_loaded) {
+               if (PicoGameLoaded) {
                        emu_reset_game();
                        return 1;
                }
@@ -964,7 +968,7 @@ static int main_menu_handler(int id, int keys)
                engineState = PGS_Quit;
                return 1;
        case MA_MAIN_PATCHES:
-               if (rom_loaded && PicoPatches) {
+               if (PicoGameLoaded && PicoPatches) {
                        menu_loop_patches();
                        PicoPatchApply();
                        menu_update_msg("Patches applied");
@@ -1001,17 +1005,17 @@ void menu_loop(void)
 {
        static int sel = 0;
 
-       me_enable(e_menu_main, MA_MAIN_RESUME_GAME, rom_loaded);
-       me_enable(e_menu_main, MA_MAIN_SAVE_STATE,  rom_loaded);
-       me_enable(e_menu_main, MA_MAIN_LOAD_STATE,  rom_loaded);
-       me_enable(e_menu_main, MA_MAIN_RESET_GAME,  rom_loaded);
+       me_enable(e_menu_main, MA_MAIN_RESUME_GAME, PicoGameLoaded);
+       me_enable(e_menu_main, MA_MAIN_SAVE_STATE,  PicoGameLoaded);
+       me_enable(e_menu_main, MA_MAIN_LOAD_STATE,  PicoGameLoaded);
+       me_enable(e_menu_main, MA_MAIN_RESET_GAME,  PicoGameLoaded);
        me_enable(e_menu_main, MA_MAIN_PATCHES, PicoPatches != NULL);
 
-       menu_enter(rom_loaded);
+       menu_enter(PicoGameLoaded);
        in_set_config_int(0, IN_CFG_BLOCKING, 1);
        me_loop_d(e_menu_main, &sel, NULL, menu_main_plat_draw);
 
-       if (rom_loaded) {
+       if (PicoGameLoaded) {
                if (engineState == PGS_Menu)
                        engineState = PGS_Running;
                /* wait until menu, ok, back is released */
@@ -1059,7 +1063,7 @@ int menu_loop_tray(void)
 {
        int ret = 1, sel = 0;
 
-       menu_enter(rom_loaded);
+       menu_enter(PicoGameLoaded);
 
        in_set_config_int(0, IN_CFG_BLOCKING, 1);
        me_loop(e_menu_tray, &sel);