notaz.gp2x.de / picodrive.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
another timer change for Dai Makaimura
[picodrive.git] / platform / gizmondo / menu.c
diff --git a/platform/gizmondo/menu.c b/platform/gizmondo/menu.c
index 09520a9..64222e5 100644 (file)
--- a/platform/gizmondo/menu.c
+++ b/platform/gizmondo/menu.c
@@ -561,7 +561,7 @@ static void draw_savestate_bg(int slot)
        }\r
 \r
        if (file) {\r
-               if (PicoMCD & 1) {\r
+               if (PicoAHW & 1) {\r
                        PicoCdLoadStateGfx(file);\r
                } else {\r
                        areaSeek(file, 0x10020, SEEK_SET);  // skip header and RAM in state file\r
@@ -687,9 +687,7 @@ static int count_bound_keys(int action, int pl_idx)
        return keys;\r
 }\r
 \r
-typedef struct { char *name; int mask; } bind_action_t;\r
-\r
-static void draw_key_config(const bind_action_t *opts, int opt_cnt, int player_idx, int sel)\r
+static void draw_key_config(const me_bind_action *opts, int opt_cnt, int player_idx, int sel)\r
 {\r
        int x, y, tl_y = 40, i;\r
 \r
@@ -723,7 +721,7 @@ static void draw_key_config(const bind_action_t *opts, int opt_cnt, int player_i
        menu_draw_end();\r
 }\r
 \r
-static void key_config_loop(const bind_action_t *opts, int opt_cnt, int player_idx)\r
+static void key_config_loop(const me_bind_action *opts, int opt_cnt, int player_idx)\r
 {\r
        int sel = 0, menu_sel_max = opt_cnt, prev_select = 0, i;\r
        unsigned long inp = 0;\r
@@ -777,27 +775,10 @@ static void draw_kc_sel(int menu_sel)
 }\r
 \r
 \r
-// PicoPad[] format: MXYZ SACB RLDU\r
-static bind_action_t ctrl_actions[] =\r
-{\r
-       { "UP     ", 0x001 },\r
-       { "DOWN   ", 0x002 },\r
-       { "LEFT   ", 0x004 },\r
-       { "RIGHT  ", 0x008 },\r
-       { "A      ", 0x040 },\r
-       { "B      ", 0x010 },\r
-       { "C      ", 0x020 },\r
-       { "START  ", 0x080 },\r
-       { "MODE   ", 0x800 },\r
-       { "X      ", 0x400 },\r
-       { "Y      ", 0x200 },\r
-       { "Z      ", 0x100 },\r
-};\r
-\r
 // player2_flag, ?, ?, ?, ?, ?, ?, menu\r
 // "NEXT SAVE SLOT", "PREV SAVE SLOT", "SWITCH RENDERER", "SAVE STATE",\r
 // "LOAD STATE", "VOLUME UP", "VOLUME DOWN", "DONE"\r
-static bind_action_t emuctrl_actions[] =\r
+me_bind_action emuctrl_actions[] =\r
 {\r
        { "Load State     ", 1<<28 },\r
        { "Save State     ", 1<<27 },\r
@@ -806,6 +787,7 @@ static bind_action_t emuctrl_actions[] =
        { "Switch Renderer", 1<<26 },\r
        { "Volume Down    ", 1<<30 },\r
        { "Volume Up      ", 1<<29 },\r
+       { NULL,              0     }\r
 };\r
 \r
 static void kc_sel_loop(void)\r
@@ -822,10 +804,10 @@ static void kc_sel_loop(void)
                if (inp & BTN_DOWN) { menu_sel++; if (menu_sel > menu_sel_max) menu_sel = 0; }\r
                if (inp & BTN_PLAY) {\r
                        switch (menu_sel) {\r
-                               case 0: key_config_loop(ctrl_actions, is_6button ? 12 : 8, 0); return;\r
-                               case 1: key_config_loop(ctrl_actions, is_6button ? 12 : 8, 1); return;\r
+                               case 0: key_config_loop(me_ctrl_actions, is_6button ? 12 : 8, 0); return;\r
+                               case 1: key_config_loop(me_ctrl_actions, is_6button ? 12 : 8, 1); return;\r
                                case 2: key_config_loop(emuctrl_actions,\r
-                                               sizeof(emuctrl_actions)/sizeof(emuctrl_actions[0]), -1); return;\r
+                                               sizeof(emuctrl_actions)/sizeof(emuctrl_actions[0]) - 1, -1); return;\r
                                case 3: if (!rom_loaded) emu_WriteConfig(0); return;\r
                                default: return;\r
                        }\r
@@ -939,9 +921,9 @@ static void cd_menu_loop_options(void)
                            selected_id == MA_CDOPT_READAHEAD) {\r
                                if (inp & BTN_LEFT) {\r
                                        PicoCDBuffers >>= 1;\r
-                                       if (PicoCDBuffers < 64) PicoCDBuffers = 0;\r
+                                       if (PicoCDBuffers < 2) PicoCDBuffers = 0;\r
                                } else {\r
-                                       if (PicoCDBuffers < 64) PicoCDBuffers = 64;\r
+                                       if (PicoCDBuffers < 2) PicoCDBuffers = 2;\r
                                        else PicoCDBuffers <<= 1;\r
                                        if (PicoCDBuffers > 8*1024) PicoCDBuffers = 8*1024; // 16M\r
                                }\r
@@ -987,6 +969,7 @@ static void cd_menu_loop_options(void)
 \r
 menu_entry opt2_entries[] =\r
 {\r
+       { "Disable sprite limit",      MB_ONOFF, MA_OPT2_NO_SPRITE_LIM, &PicoOpt, 0x40000, 0, 0, 1, 1 },\r
        { "Emulate Z80",               MB_ONOFF, MA_OPT2_ENABLE_Z80,    &currentConfig.PicoOpt,0x0004, 0, 0, 1 },\r
        { "Emulate YM2612 (FM)",       MB_ONOFF, MA_OPT2_ENABLE_YM2612, &currentConfig.PicoOpt,0x0001, 0, 0, 1 },\r
        { "Emulate SN76496 (PSG)",     MB_ONOFF, MA_OPT2_ENABLE_SN76496,&currentConfig.PicoOpt,0x0002, 0, 0, 1 },\r
@@ -1242,7 +1225,7 @@ static int menu_loop_options(void)
                                                        currentConfig.PsndRate =  11025;\r
                                                        currentConfig.PicoOpt |=  8;\r
                                                } else if ((inp & BTN_LEFT) && currentConfig.PsndRate == 11025 &&\r
-                                                               (currentConfig.PicoOpt&0x08) && !(PicoMCD&1))\r
+                                                               (currentConfig.PicoOpt&0x08) && !(PicoAHW&1))\r
                                                {\r
                                                        currentConfig.PsndRate =  44100;\r
                                                        currentConfig.PicoOpt &= ~8;\r
@@ -1332,7 +1315,7 @@ static void draw_menu_credits(void)
        int tl_x = 15, tl_y = 64, y;\r
        menu_draw_begin(1);\r
 \r
-       text_out16(tl_x, 20, "PicoDrive v" VERSION " (c) notaz, 2006,2007");\r
+       text_out16(tl_x, 20, "PicoDrive v" VERSION " (c) notaz, 2006-2008");\r
 \r
        y = tl_y;\r
        text_out16(tl_x, y, "Credits:");\r
@@ -1635,10 +1618,11 @@ int menu_loop_tray(void)
                                case 0: // select image\r
                                        selfname = romsel_loop(curr_path);\r
                                        if (selfname) {\r
-                                               int ret = -1, cd_type;\r
+                                               int ret = -1;\r
+                                               cd_img_type cd_type;\r
                                                cd_type = emu_cdCheck(NULL);\r
-                                               if (cd_type > 0)\r
-                                                       ret = Insert_CD(romFileName, cd_type == 2);\r
+                                               if (cd_type != CIT_NOT_CD)\r
+                                                       ret = Insert_CD(romFileName, cd_type);\r
                                                if (ret != 0) {\r
                                                        sprintf(menuErrorMsg, "Load failed, invalid CD image?");\r
                                                        lprintf("%s\n", menuErrorMsg);\r
fast MegaDrive/MegaCD/32X emulator