perfect vsync

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

diff --git a/platform/gp2x/menu.c b/platform/gp2x/menu.c
index 3386a95..0b8264e 100644 (file)
--- a/platform/gp2x/menu.c
+++ b/platform/gp2x/menu.c
@@ -597,7 +597,8 @@ static void draw_savestate_menu(int menu_sel, int is_loading)
 \r
 static int savestate_menu_loop(int is_loading)\r
 {\r
-       int menu_sel = 10, menu_sel_max = 10;\r
+       static int menu_sel = 10;\r
+       int menu_sel_max = 10;\r
        unsigned long inp = 0;\r
 \r
        state_check_slots();\r
@@ -820,7 +821,8 @@ static void draw_cd_menu_options(int menu_sel, char *b_us, char *b_eu, char *b_j
 \r
 static void cd_menu_loop_options(void)\r
 {\r
-       int menu_sel = 0, menu_sel_max = 10;\r
+       static int menu_sel = 0;\r
+       int menu_sel_max = 10;\r
        unsigned long inp = 0;\r
        char bios_us[32], bios_eu[32], bios_jp[32], *bios, *p;\r
 \r
@@ -897,7 +899,7 @@ static void cd_menu_loop_options(void)
 \r
 static void draw_amenu_options(int menu_sel)\r
 {\r
-       int tl_x = 25, tl_y = 60, y;\r
+       int tl_x = 25, tl_y = 50, y;\r
        char *mms = mmuhack_status ? "active)  " : "inactive)";\r
 \r
        y = tl_y;\r
@@ -905,14 +907,16 @@ static void draw_amenu_options(int menu_sel)
        gp2x_pd_clone_buffer2();\r
 \r
        gp2x_text_out8(tl_x, y,       "Gamma correction           %i.%02i", currentConfig.gamma / 100, currentConfig.gamma%100); // 0\r
-       gp2x_text_out8(tl_x, (y+=10), "Emulate Z80                %s", (currentConfig.PicoOpt&0x004)?"ON":"OFF"); // 1\r
-       gp2x_text_out8(tl_x, (y+=10), "Emulate YM2612 (FM)        %s", (currentConfig.PicoOpt&0x001)?"ON":"OFF"); // 2\r
-       gp2x_text_out8(tl_x, (y+=10), "Emulate SN76496 (PSG)      %s", (currentConfig.PicoOpt&0x002)?"ON":"OFF"); // 3\r
-       gp2x_text_out8(tl_x, (y+=10), "gzip savestates            %s", (currentConfig.EmuOpt &0x008)?"ON":"OFF"); // 4\r
-       gp2x_text_out8(tl_x, (y+=10), "Don't save last used ROM   %s", (currentConfig.EmuOpt &0x020)?"ON":"OFF"); // 5\r
+       gp2x_text_out8(tl_x, (y+=10), "A_SN's gamma curve         %s", (currentConfig.EmuOpt &0x1000)?"ON":"OFF");\r
+       gp2x_text_out8(tl_x, (y+=10), "Perfecf vsync              %s", (currentConfig.EmuOpt &0x2000)?"ON":"OFF");\r
+       gp2x_text_out8(tl_x, (y+=10), "Emulate Z80                %s", (currentConfig.PicoOpt&0x0004)?"ON":"OFF");\r
+       gp2x_text_out8(tl_x, (y+=10), "Emulate YM2612 (FM)        %s", (currentConfig.PicoOpt&0x0001)?"ON":"OFF");\r
+       gp2x_text_out8(tl_x, (y+=10), "Emulate SN76496 (PSG)      %s", (currentConfig.PicoOpt&0x0002)?"ON":"OFF"); // 5\r
+       gp2x_text_out8(tl_x, (y+=10), "gzip savestates            %s", (currentConfig.EmuOpt &0x0008)?"ON":"OFF");\r
+       gp2x_text_out8(tl_x, (y+=10), "Don't save last used ROM   %s", (currentConfig.EmuOpt &0x0020)?"ON":"OFF");\r
        gp2x_text_out8(tl_x, (y+=10), "needs restart:");\r
-       gp2x_text_out8(tl_x, (y+=10), "craigix's RAM timings      %s", (currentConfig.EmuOpt &0x100)?"ON":"OFF"); // 7\r
-       gp2x_text_out8(tl_x, (y+=10), "squidgehack (now %s %s",   mms, (currentConfig.EmuOpt &0x010)?"ON":"OFF"); // 8\r
+       gp2x_text_out8(tl_x, (y+=10), "craigix's RAM timings      %s", (currentConfig.EmuOpt &0x0100)?"ON":"OFF");\r
+       gp2x_text_out8(tl_x, (y+=10), "squidgehack (now %s %s",   mms, (currentConfig.EmuOpt &0x0010)?"ON":"OFF"); // 10\r
        gp2x_text_out8(tl_x, (y+=10), "Done");\r
 \r
        // draw cursor\r
@@ -923,7 +927,8 @@ static void draw_amenu_options(int menu_sel)
 \r
 static void amenu_loop_options(void)\r
 {\r
-       int menu_sel = 0, menu_sel_max = 9;\r
+       static int menu_sel = 0;\r
+       int menu_sel_max = 11;\r
        unsigned long inp = 0;\r
 \r
        for(;;)\r
@@ -934,14 +939,16 @@ static void amenu_loop_options(void)
                if(inp & GP2X_DOWN) { menu_sel++; if (menu_sel > menu_sel_max) menu_sel = 0; }\r
                if((inp& GP2X_B)||(inp&GP2X_LEFT)||(inp&GP2X_RIGHT)) { // toggleable options\r
                        switch (menu_sel) {\r
-                               case  1: currentConfig.PicoOpt^=0x004; break;\r
-                               case  2: currentConfig.PicoOpt^=0x001; break;\r
-                               case  3: currentConfig.PicoOpt^=0x002; break;\r
-                               case  4: currentConfig.EmuOpt ^=0x008; break;\r
-                               case  5: currentConfig.EmuOpt ^=0x020; break;\r
-                               case  7: currentConfig.EmuOpt ^=0x100; break;\r
-                               case  8: currentConfig.EmuOpt ^=0x010; break;\r
-                               case  9: return;\r
+                               case  1: currentConfig.EmuOpt ^=0x1000; break;\r
+                               case  2: currentConfig.EmuOpt ^=0x2000; break;\r
+                               case  3: currentConfig.PicoOpt^=0x0004; break;\r
+                               case  4: currentConfig.PicoOpt^=0x0001; break;\r
+                               case  5: currentConfig.PicoOpt^=0x0002; break;\r
+                               case  6: currentConfig.EmuOpt ^=0x0008; break;\r
+                               case  7: currentConfig.EmuOpt ^=0x0020; break;\r
+                               case  9: currentConfig.EmuOpt ^=0x0100; break;\r
+                               case 10: currentConfig.EmuOpt ^=0x0010; break;\r
+                               case 11: return;\r
                        }\r
                }\r
                if(inp & (GP2X_X|GP2X_A)) return;\r
@@ -1098,7 +1105,8 @@ static void menu_options_save(void)
 \r
 static int menu_loop_options(void)\r
 {\r
-       int menu_sel = 0, menu_sel_max = 17;\r
+       static int menu_sel = 0;\r
+       int menu_sel_max = 17;\r
        unsigned long inp = 0;\r
 \r
        if (rom_data) menu_sel_max++;\r