work on 'vblank on line start' problem, var changes, mask defines

[libpicofe.git] / gp2x / menu.c

diff --git a/gp2x/menu.c b/gp2x/menu.c
index 506b7c4..432a41a 100644 (file)
--- a/gp2x/menu.c
+++ b/gp2x/menu.c
@@ -124,6 +124,8 @@ static unsigned long wait_for_input_usbjoy(unsigned long interesting, int *joy)
        // handle only 1 event at a time\r
        for (i = 1; i != 0; i <<= 1)\r
                if (ret & i) { ret &= i; break; }\r
+       // ... but allow select\r
+       ret |= inp_prev & GP2X_SELECT;\r
 \r
        return ret;\r
 }\r
@@ -551,7 +553,7 @@ static void draw_savestate_bg(int slot)
        }\r
 \r
        if (file) {\r
-               if (PicoMCD & 1) {\r
+               if (PicoAHW & PAHW_MCD) {\r
                        PicoCdLoadStateGfx(file);\r
                } else {\r
                        areaSeek(file, 0x10020, SEEK_SET);  // skip header and RAM in state file\r
@@ -780,7 +782,8 @@ static void key_config_loop(const me_bind_action *opts, int opt_cnt, int player_
                draw_key_config(opts, opt_cnt, player_idx, sel);\r
                inp = wait_for_input_usbjoy(CONFIGURABLE_KEYS, &joy);\r
                // printf("got %08lX from joy %i\n", inp, joy);\r
-               if (joy == 0) {\r
+               if (joy == 0)\r
+               {\r
                        if (!(inp & GP2X_SELECT)) {\r
                                prev_select = 0;\r
                                if(inp & GP2X_UP  ) { sel--; if (sel < 0) sel = menu_sel_max; continue; }\r
@@ -875,7 +878,7 @@ static void kc_sel_loop(void)
 {\r
        int menu_sel = 3, menu_sel_max = 3;\r
        unsigned long inp = 0;\r
-       int is_6button = PicoOpt & 0x020;\r
+       int is_6button = PicoOpt & POPT_6BTN_PAD;\r
 \r
        while (1)\r
        {\r
@@ -1059,6 +1062,7 @@ menu_entry opt2_entries[] =
        { "Emulate Z80",               MB_ONOFF, MA_OPT2_ENABLE_Z80,    &PicoOpt, 0x00004, 0, 0, 1, 1 },\r
        { "Emulate YM2612 (FM)",       MB_ONOFF, MA_OPT2_ENABLE_YM2612, &PicoOpt, 0x00001, 0, 0, 1, 1 },\r
        { "Emulate SN76496 (PSG)",     MB_ONOFF, MA_OPT2_ENABLE_SN76496,&PicoOpt, 0x00002, 0, 0, 1, 1 },\r
+       { "Disable sprite limit",      MB_ONOFF, MA_OPT2_NO_SPRITE_LIM, &PicoOpt, 0x40000, 0, 0, 1, 1 },\r
        { "gzip savestates",           MB_ONOFF, MA_OPT2_GZIP_STATES,   &currentConfig.EmuOpt, 0x0008, 0, 0, 1, 1 },\r
        { "Don't save last used ROM",  MB_ONOFF, MA_OPT2_NO_LAST_ROM,   &currentConfig.EmuOpt, 0x0020, 0, 0, 1, 1 },\r
        { "needs restart:",            MB_NONE,  MA_NONE,               NULL, 0, 0, 0, 1, 0 },\r
@@ -1170,7 +1174,7 @@ static void menu_opt_cust_draw(const menu_entry *entry, int x, int y, void *para
        switch (entry->id)\r
        {\r
                case MA_OPT_RENDERER:\r
-                       if (PicoOpt&0x10)\r
+                       if (PicoOpt & POPT_ALT_RENDERER)\r
                                str = " 8bit fast";\r
                        else if (currentConfig.EmuOpt&0x80)\r
                                str = "16bit accurate";\r
@@ -1194,7 +1198,7 @@ static void menu_opt_cust_draw(const menu_entry *entry, int x, int y, void *para
                        text_out16(x, y, "Frameskip                  %s", str24);\r
                        break;\r
                case MA_OPT_SOUND_QUALITY:\r
-                       str = (PicoOpt&0x08)?"stereo":"mono";\r
+                       str = (PicoOpt & POPT_EN_STEREO) ? "stereo" : "mono";\r
                        text_out16(x, y, "Sound Quality:     %5iHz %s", PsndRate, str);\r
                        break;\r
                case MA_OPT_REGION:\r
@@ -1284,7 +1288,7 @@ static void menu_options_save(void)
                // force setting possibly changed..\r
                Pico.m.pal = (PicoRegionOverride == 2 || PicoRegionOverride == 8) ? 1 : 0;\r
        }\r
-       if (!(PicoOpt & 0x20)) {\r
+       if (!(PicoOpt & POPT_6BTN_PAD)) {\r
                // unbind XYZ MODE, just in case\r
                unbind_action(0xf00, -1, -1);\r
        }\r