new cfg file system

[picodrive.git] / platform / gizmondo / menu.c

diff --git a/platform/gizmondo/menu.c b/platform/gizmondo/menu.c
index b1d3b14..09520a9 100644 (file)
--- a/platform/gizmondo/menu.c
+++ b/platform/gizmondo/menu.c
@@ -1080,29 +1080,6 @@ menu_entry opt_entries[] =
 #define OPT_ENTRY_COUNT (sizeof(opt_entries) / sizeof(opt_entries[0]))\r
 \r
 \r
-static const char *region_name(unsigned int code)\r
-{\r
-       static const char *names[] = { "Auto", "      Japan NTSC", "      Japan PAL", "      USA", "      Europe" };\r
-       static const char *names_short[] = { "", " JP", " JP", " US", " EU" };\r
-       int u, i = 0;\r
-       if (code) {\r
-               code <<= 1;\r
-               while((code >>= 1)) i++;\r
-               if (i > 4) return "unknown";\r
-               return names[i];\r
-       } else {\r
-               static char name[24];\r
-               strcpy(name, "Auto:");\r
-               for (u = 0; u < 3; u++) {\r
-                       i = 0; code = ((PicoAutoRgnOrder >> u*4) & 0xf) << 1;\r
-                       while((code >>= 1)) i++;\r
-                       strcat(name, names_short[i]);\r
-               }\r
-               return name;\r
-       }\r
-}\r
-\r
-\r
 static void menu_opt_cust_draw(const menu_entry *entry, int x, int y, void *param)\r
 {\r
        char *str, str24[24];\r
@@ -1129,7 +1106,7 @@ static void menu_opt_cust_draw(const menu_entry *entry, int x, int y, void *para
                        text_out16(x, y, "Sound Quality:     %5iHz %s", currentConfig.PsndRate, str);\r
                        break;\r
                case MA_OPT_REGION:\r
-                       text_out16(x, y, "Region:              %s", region_name(currentConfig.PicoRegion));\r
+                       text_out16(x, y, "Region:              %s", me_region_name(PicoRegionOverride, PicoAutoRgnOrder));\r
                        break;\r
                case MA_OPT_CONFIRM_STATES:\r
                        switch ((currentConfig.EmuOpt >> 9) & 5) {\r
@@ -1188,21 +1165,21 @@ static void region_prevnext(int right)
        static int rgn_orders[] = { 0x148, 0x184, 0x814, 0x418, 0x841, 0x481 };\r
        int i;\r
        if (right) {\r
-               if (!currentConfig.PicoRegion) {\r
+               if (!PicoRegionOverride) {\r
                        for (i = 0; i < 6; i++)\r
                                if (rgn_orders[i] == PicoAutoRgnOrder) break;\r
                        if (i < 5) PicoAutoRgnOrder = rgn_orders[i+1];\r
-                       else currentConfig.PicoRegion=1;\r
+                       else PicoRegionOverride=1;\r
                }\r
-               else currentConfig.PicoRegion<<=1;\r
-               if (currentConfig.PicoRegion > 8) currentConfig.PicoRegion = 8;\r
+               else PicoRegionOverride<<=1;\r
+               if (PicoRegionOverride > 8) PicoRegionOverride = 8;\r
        } else {\r
-               if (!currentConfig.PicoRegion) {\r
+               if (!PicoRegionOverride) {\r
                        for (i = 0; i < 6; i++)\r
                                if (rgn_orders[i] == PicoAutoRgnOrder) break;\r
                        if (i > 0) PicoAutoRgnOrder = rgn_orders[i-1];\r
                }\r
-               else currentConfig.PicoRegion>>=1;\r
+               else PicoRegionOverride>>=1;\r
        }\r
 }\r
 \r
@@ -1210,7 +1187,6 @@ static void menu_options_save(void)
 {\r
        PicoOpt = currentConfig.PicoOpt;\r
        PsndRate = currentConfig.PsndRate;\r
-       PicoRegionOverride = currentConfig.PicoRegion;\r
        if (PicoRegionOverride) {\r
                // force setting possibly changed..\r
                Pico.m.pal = (PicoRegionOverride == 2 || PicoRegionOverride == 8) ? 1 : 0;\r
@@ -1230,7 +1206,6 @@ static int menu_loop_options(void)
 \r
        currentConfig.PicoOpt = PicoOpt;\r
        currentConfig.PsndRate = PsndRate;\r
-       currentConfig.PicoRegion = PicoRegionOverride;\r
 \r
        me_enable(opt_entries, OPT_ENTRY_COUNT, MA_OPT_SAVECFG_GAME, rom_loaded);\r
        me_enable(opt_entries, OPT_ENTRY_COUNT, MA_OPT_LOADCFG, config_slot != config_slot_current);\r