cheats, gg

git-svn-id: file:///home/notaz/opt/svn/fceu@149 be3aeb3a-fb24-0410-a615-afba39da0efa

diff --git a/drivers/gp2x/input.c b/drivers/gp2x/input.c
index 43da4b3..6a51264 100644 (file)
--- a/drivers/gp2x/input.c
+++ b/drivers/gp2x/input.c
@@ -22,6 +22,8 @@
 #include "../../video.h"
 #include "usbjoy.h"
 
+extern int FSkip;
+
 /* UsrInputType[] is user-specified.  InputType[] is current
        (game loading can override user settings)
 */
@@ -184,7 +186,7 @@ static void do_fake_mouse(unsigned long keys)
 }
 
 
-void FCEUD_UpdateInput(void)
+static void FCEUD_UpdateInput(void)
 {
        static int volpushed_frames = 0;
        static int turbo_rate_cnt_a[2] = {0,0}, turbo_rate_cnt_b[2] = {0,0};
@@ -195,6 +197,7 @@ void FCEUD_UpdateInput(void)
        if ((down(VOL_DOWN) && down(VOL_UP)) || (keys & (GP2X_L|GP2X_L|GP2X_START)) == (GP2X_L|GP2X_L|GP2X_START))
        {
                Exit = 1;
+               FSkip = 0;      /* force rendering the last frame for menu */
                return;
        }
        else if (down(VOL_UP))

diff --git a/drivers/gp2x/main.c b/drivers/gp2x/main.c
index 05724c6..21cdea5 100644 (file)
--- a/drivers/gp2x/main.c
+++ b/drivers/gp2x/main.c
@@ -39,6 +39,7 @@
 #include "../common/cheat.h"
 
 #include "../../fce.h"
+#include "../../cart.h"
 
 #include "dface.h"
 
@@ -249,7 +250,7 @@ static int DoArgs(int argc, char *argv[])
          {"-input1",0,&inputa[0],0x4001},{"-input2",0,&inputa[1],0x4001},
          {"-fcexp",0,&fcexp,0x4001},
 
-         {"-gg",&docheckie[1],0,0},
+         {"-gg",0,&eoptions,0x8000|EO_GG},
          {"-no8lim",0,&eoptions,0x8000|EO_NO8LIM},
          {"-snapname",0,&eoptions,0x8000|EO_SNAPNAME},
         {"-nofs",0,&eoptions,0x8000|EO_NOFOURSCORE},
@@ -274,8 +275,7 @@ static int DoArgs(int argc, char *argv[])
        }
        if(docheckie[0])
         Settings.region_force=2;
-       if(docheckie[1])
-        FCEUI_SetGameGenie(1);
+       FCEUI_SetGameGenie(eoptions&EO_GG);
         FCEUI_DisableSpriteLimitation(eoptions&EO_NO8LIM);
        FCEUI_SetSnapName(eoptions&EO_SNAPNAME);
 
@@ -388,7 +388,12 @@ int CLImain(int argc, char *argv[])
           ParseGI(fceugi);
           InitOtherInput();
 
-          GameInterface(GI_INFOSTRING, infostring);
+          if ((eoptions&EO_GG) && geniestage == 0) {
+           strcpy(infostring, "gg.rom is missing, GG disabled");
+           eoptions&=~EO_GG;
+           FCEUI_SetGameGenie(0);
+          } else
+           GameInterface(GI_INFOSTRING, infostring);
           FCEU_DispMessage("%s", infostring);
          }
          else

diff --git a/drivers/gp2x/main.h b/drivers/gp2x/main.h
index 1ea651a..be5ae19 100644 (file)
--- a/drivers/gp2x/main.h
+++ b/drivers/gp2x/main.h
@@ -26,6 +26,7 @@ extern int eoptions;
 #define EO_SNAPNAME    16
 #define EO_NOFOURSCORE 32
 #define EO_NOTHROTTLE  64
+#define EO_GG          128
 extern int srendline,erendline,srendlinev[2],erendlinev[2];
 extern int NoWaiting;
 

diff --git a/drivers/gp2x/menu.c b/drivers/gp2x/menu.c
index 86aff23..e4b3488 100644 (file)
--- a/drivers/gp2x/menu.c
+++ b/drivers/gp2x/menu.c
@@ -194,7 +194,7 @@ static void gp2x_smalltext16(int x, int y, const char *texto)
        }\r
 }\r
 \r
-static void gp2x_smalltext8_lim(int x, int y, const char *texto, int max)\r
+static void gp2x_smalltext16_lim(int x, int y, const char *texto, int max)\r
 {\r
        char    buffer[320/6+1];\r
 \r
@@ -306,16 +306,16 @@ static void draw_dirlist(char *curdir, struct dirent **namelist, int n, int sel)
        gp2x_fceu_darken_all();\r
 \r
        if(start - 2 >= 0)\r
-               gp2x_smalltext8_lim(14, (start - 2)*10, curdir, 53-2);\r
+               gp2x_smalltext16_lim(14, (start - 2)*10, curdir, 53-2);\r
        for (i = 0; i < n; i++) {\r
                pos = start + i;\r
                if (pos < 0)  continue;\r
                if (pos > 23) break;\r
                if (namelist[i+1]->d_type == DT_DIR) {\r
-                       gp2x_smalltext8_lim(14,   pos*10, "/", 1);\r
-                       gp2x_smalltext8_lim(14+6, pos*10, namelist[i+1]->d_name, 53-3);\r
+                       gp2x_smalltext16_lim(14,   pos*10, "/", 1);\r
+                       gp2x_smalltext16_lim(14+6, pos*10, namelist[i+1]->d_name, 53-3);\r
                } else {\r
-                       gp2x_smalltext8_lim(14,   pos*10, namelist[i+1]->d_name, 53-2);\r
+                       gp2x_smalltext16_lim(14,   pos*10, namelist[i+1]->d_name, 53-2);\r
                }\r
        }\r
        gp2x_text_out15(5, 120, ">");\r
@@ -468,47 +468,69 @@ static char *filesel_loop(char *curr_path, char *final_dest)
 \r
 // ------------ patch/gg menu ------------\r
 \r
-#if 0 // TODO?\r
-static void draw_patchlist(int sel)\r
+extern void *cheats;\r
+static int cheat_count = 0, cheat_start, cheat_pos;\r
+\r
+static int countcallb(char *name, uint32 a, uint8 v, int compare, int s, int type, void *data)\r
 {\r
-       int start, i, pos;\r
+       cheat_count++;\r
+       return 1;\r
+}\r
 \r
-       start = 12 - sel;\r
+static int clistcallb(char *name, uint32 a, uint8 v, int compare, int s, int type, void *data)\r
+{\r
+       int pos;\r
+\r
+       pos = cheat_start + cheat_pos;\r
+       cheat_pos++;\r
+       if (pos < 0)  return 1;\r
+       if (pos > 23) return 0;\r
+\r
+       gp2x_smalltext16_lim(14,     pos*10, s ? "ON " : "OFF", 3);\r
+       gp2x_smalltext16_lim(14+6*4, pos*10, type ? "S" : "R", 1);\r
+       gp2x_smalltext16_lim(14+6*6, pos*10, name, 53-8);\r
+\r
+       return 1;\r
+}\r
+\r
+static void draw_patchlist(int sel)\r
+{\r
+       int pos;\r
 \r
        gp2x_fceu_copy_bg();\r
+       gp2x_fceu_darken_all();\r
 \r
-       for (i = 0; i < PicoPatchCount; i++) {\r
-               pos = start + i;\r
-               if (pos < 0)  continue;\r
-               if (pos > 23) break;\r
-               gp2x_smalltext8_lim(14,     pos*10, PicoPatches[i].active ? "ON " : "OFF", 3);\r
-               gp2x_smalltext8_lim(14+6*4, pos*10, PicoPatches[i].name, 53-6);\r
-       }\r
-       pos = start + i;\r
-       if (pos < 24) gp2x_smalltext8_lim(14, pos*10, "done", 4);\r
+       cheat_start = 12 - sel;\r
+       cheat_pos = 0;\r
+       FCEUI_ListCheats(clistcallb,0);\r
+\r
+       pos = cheat_start + cheat_pos;\r
+       if (pos < 24) gp2x_smalltext16_lim(14, pos*10, "done", 4);\r
 \r
        gp2x_text_out15(5, 120, ">");\r
        gp2x_video_flip();\r
 }\r
 \r
-\r
 void patches_menu_loop(void)\r
 {\r
        int menu_sel = 0;\r
        unsigned long inp = 0;\r
 \r
+       cheat_count = 0;\r
+       FCEUI_ListCheats(countcallb,0);\r
+\r
        for(;;)\r
        {\r
                draw_patchlist(menu_sel);\r
                inp = wait_for_input(GP2X_UP|GP2X_DOWN|GP2X_LEFT|GP2X_RIGHT|GP2X_L|GP2X_R|GP2X_B|GP2X_X);\r
-               if(inp & GP2X_UP  ) { menu_sel--; if (menu_sel < 0) menu_sel = PicoPatchCount; }\r
-               if(inp & GP2X_DOWN) { menu_sel++; if (menu_sel > PicoPatchCount) menu_sel = 0; }\r
+               if(inp & GP2X_UP  ) { menu_sel--; if (menu_sel < 0) menu_sel = cheat_count; }\r
+               if(inp & GP2X_DOWN) { menu_sel++; if (menu_sel > cheat_count) menu_sel = 0; }\r
                if(inp &(GP2X_LEFT|GP2X_L))  { menu_sel-=10; if (menu_sel < 0) menu_sel = 0; }\r
-               if(inp &(GP2X_RIGHT|GP2X_R)) { menu_sel+=10; if (menu_sel > PicoPatchCount) menu_sel = PicoPatchCount; }\r
+               if(inp &(GP2X_RIGHT|GP2X_R)) { menu_sel+=10; if (menu_sel > cheat_count) menu_sel = cheat_count; }\r
                if(inp & GP2X_B) { // action\r
-                       if (menu_sel < PicoPatchCount)\r
-                               PicoPatches[menu_sel].active = !PicoPatches[menu_sel].active;\r
-                       else    return;\r
+                       if (menu_sel < cheat_count)\r
+                            FCEUI_ToggleCheat(menu_sel);\r
+                       else return;\r
                }\r
                if(inp & GP2X_X) return;\r
        }\r
@@ -517,6 +539,7 @@ void patches_menu_loop(void)
 \r
 // ------------ savestate loader ------------\r
 \r
+#if 0\r
 static void menu_prepare_bg(void);\r
 \r
 static int state_slot_flags = 0;\r
@@ -942,7 +965,8 @@ static void draw_fcemenu_options(int menu_sel)
        gp2x_text_out15(tl_x, (y+=10), "Last visible line (PAL)    %i", erendlinev[1]);\r
        gp2x_text_out15(tl_x, (y+=10), "Clip 8 left/right columns  %s", (eoptions&EO_CLIPSIDES)?"ON":"OFF");\r
        gp2x_text_out15(tl_x, (y+=10), "Disable 8 sprite limit     %s", (eoptions&EO_NO8LIM)?"ON":"OFF");\r
-       gp2x_text_out15(tl_x, (y+=10), "Done");                                                 // 10\r
+       gp2x_text_out15(tl_x, (y+=10), "Enable authentic GameGenie %s", (eoptions&EO_GG)?"ON":"OFF");\r
+       gp2x_text_out15(tl_x, (y+=10), "Done");                                                 // 11\r
 \r
        // draw cursor\r
        gp2x_text_out15(tl_x - 16, tl_y + menu_sel*10, ">");\r
@@ -961,7 +985,7 @@ static void draw_fcemenu_options(int menu_sel)
 \r
 static void fcemenu_loop_options(void)\r
 {\r
-       int menu_sel = 0, menu_sel_max = 10, i;\r
+       int menu_sel = 0, menu_sel_max = 11, i;\r
        unsigned long inp = 0;\r
 \r
        FCEUI_GetNTSCTH(&ntsctint, &ntschue);\r
@@ -977,7 +1001,8 @@ static void fcemenu_loop_options(void)
                                case  1: ntsccol = !ntsccol; break;\r
                                case  8: eoptions^=EO_CLIPSIDES; break;\r
                                case  9: eoptions^=EO_NO8LIM; break;\r
-                               case 10: return;\r
+                               case 10: eoptions^=EO_GG; break;\r
+                               case 11: return;\r
                        }\r
                }\r
                if(inp & (GP2X_X|GP2X_A)) {\r
@@ -989,6 +1014,7 @@ static void fcemenu_loop_options(void)
                        FCEUI_SetNTSCTH(ntsccol, ntsctint, ntschue);\r
                        FCEUI_SetRenderedLines(srendlinev[0],erendlinev[0],srendlinev[1],erendlinev[1]);\r
                        FCEUI_DisableSpriteLimitation(eoptions&EO_NO8LIM);\r
+                       FCEUI_SetGameGenie(eoptions&EO_GG);\r
                        if (cpalette) LoadCPalette();\r
                        else FCEUI_SetPaletteArray(0); // set to default\r
                        FCEU_ResetPalette();\r
@@ -1199,7 +1225,7 @@ static void draw_menu_credits(void)
 \r
 static void draw_menu_root(int menu_sel)\r
 {\r
-       int tl_x = 30, tl_y = 128, y;\r
+       int tl_x = 30, tl_y = 126, y;\r
        gp2x_fceu_copy_bg();\r
 \r
        y = tl_y;\r
@@ -1216,9 +1242,9 @@ static void draw_menu_root(int menu_sel)
        gp2x_text_out15(tl_x, (y+=10), "Controls");\r
        gp2x_text_out15(tl_x, (y+=10), "Credits");\r
        gp2x_text_out15(tl_x, (y+=10), "Exit");\r
-// TODO\r
-//     if (PicoPatches)\r
-//             gp2x_text_out15(tl_x, (y+=10), "Patches / GameGenie");\r
+\r
+       if (cheats)\r
+               gp2x_text_out15(tl_x, (y+=10), "Cheats");\r
 \r
        // draw cursor\r
        gp2x_text_out15(tl_x - 16, tl_y + menu_sel*10, ">");\r
@@ -1231,7 +1257,7 @@ static void draw_menu_root(int menu_sel)
        else {\r
                char vstr[16];\r
                sprintf(vstr, "v" GP2X_PORT_VERSION " r%i", GP2X_PORT_REV);\r
-               gp2x_text_out15(320-strlen(vstr)*8-1, 229, vstr);\r
+               gp2x_text_out15(320-strlen(vstr)*8-1, 228, vstr);\r
        }\r
        gp2x_fceu_darken_text_bg();\r
        gp2x_video_flip();\r
@@ -1245,7 +1271,7 @@ static int menu_loop_root(void)
        unsigned long inp = 0;\r
 \r
        if (fceugi) menu_sel_min = 0;\r
-// TODO        if (PicoPatches) menu_sel_max = 9;\r
+       if (cheats) menu_sel_max = 9;\r
        if (menu_sel < menu_sel_min || menu_sel > menu_sel_max)\r
                menu_sel = menu_sel_min;\r
 \r
@@ -1341,6 +1367,7 @@ static int menu_loop_root(void)
                                case 8: // exit\r
                                        return 1;\r
                                case 9: // patches/gg\r
+                                       patches_menu_loop();\r
                                        break;\r
                        }\r
                }\r