X-Git-Url: https://notaz.gp2x.de/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=gp2x%2Fmenu.c;h=d424152fdd77147706b4083e2b91e5e5a9b222b4;hb=8f1b51efbc8b3047ee6959d1f69add033341bf67;hp=9a2914a7d01abac91f2cc83a0f44a8328a6081ec;hpb=4ffd28584ea826a527defbe194d3a79d5128f63d;p=libpicofe.git

diff --git a/gp2x/menu.c b/gp2x/menu.c
index 9a2914a..d424152 100644
--- a/gp2x/menu.c
+++ b/gp2x/menu.c
@@ -17,8 +17,9 @@
 #include "usbjoy.h"
 #include "version.h"
 
-#include "Pico/PicoInt.h"
-#include "zlib/zlib.h"
+#include <Pico/PicoInt.h>
+#include <Pico/Patch.h>
+#include <zlib/zlib.h>
 
 #ifndef _DIRENT_HAVE_D_TYPE
 #error "need d_type for file browser
@@ -391,6 +392,54 @@ static char *romsel_loop(char *curr_path)
 	return ret;
 }
 
+// ------------ patch/gg menu ------------
+
+static void draw_patchlist(int sel)
+{
+	int start, i, pos;
+
+	start = 12 - sel;
+
+	gp2x_pd_clone_buffer2();
+
+	for (i = 0; i < PicoPatchCount; i++) {
+		pos = start + i;
+		if (pos < 0)  continue;
+		if (pos > 23) break;
+		gp2x_smalltext8_lim(14,     pos*10, PicoPatches[i].active ? "ON " : "OFF", 3);
+		gp2x_smalltext8_lim(14+6*4, pos*10, PicoPatches[i].name, 53-6);
+	}
+	pos = start + i;
+	if (pos < 24) gp2x_smalltext8_lim(14, pos*10, "done", 4);
+
+	gp2x_text_out8(5, 120, ">");
+	gp2x_video_flip2();
+}
+
+
+void patches_menu_loop(void)
+{
+	int menu_sel = 0;
+	unsigned long inp = 0;
+
+	for(;;)
+	{
+		draw_patchlist(menu_sel);
+		inp = wait_for_input(GP2X_UP|GP2X_DOWN|GP2X_LEFT|GP2X_RIGHT|GP2X_L|GP2X_R|GP2X_B|GP2X_X);
+		if(inp & GP2X_UP  ) { menu_sel--; if (menu_sel < 0) menu_sel = PicoPatchCount; }
+		if(inp & GP2X_DOWN) { menu_sel++; if (menu_sel > PicoPatchCount) menu_sel = 0; }
+		if(inp &(GP2X_LEFT|GP2X_L))  { menu_sel-=10; if (menu_sel < 0) menu_sel = 0; }
+		if(inp &(GP2X_RIGHT|GP2X_R)) { menu_sel+=10; if (menu_sel > PicoPatchCount) menu_sel = PicoPatchCount; }
+		if(inp & GP2X_B) { // action
+			if (menu_sel < PicoPatchCount)
+				PicoPatches[menu_sel].active = !PicoPatches[menu_sel].active;
+			else 	return;
+		}
+		if(inp & GP2X_X) return;
+	}
+
+}
+
 // ------------ savestate loader ------------
 
 static void menu_prepare_bg(void);
@@ -680,6 +729,10 @@ static void kc_sel_loop(void)
 static void draw_cd_menu_options(int menu_sel, char *b_us, char *b_eu, char *b_jp)
 {
 	int tl_x = 25, tl_y = 60, y;
+	char ra_buff[16];
+
+	if (PicoCDBuffers > 1) sprintf(ra_buff, "%5iK", PicoCDBuffers * 2);
+	else strcpy(ra_buff, "     OFF");
 
 	y = tl_y;
 	//memset(gp2x_screen, 0, 320*240);
@@ -688,9 +741,12 @@ static void draw_cd_menu_options(int menu_sel, char *b_us, char *b_eu, char *b_j
 	gp2x_text_out8(tl_x, y,       "USA BIOS:     %s", b_us); // 0
 	gp2x_text_out8(tl_x, (y+=10), "EUR BIOS:     %s", b_eu); // 1
 	gp2x_text_out8(tl_x, (y+=10), "JAP BIOS:     %s", b_jp); // 2
-	gp2x_text_out8(tl_x, (y+=10), "CD LEDs                    %s", (currentConfig.EmuOpt &0x400)?"ON":"OFF"); // 3
-	gp2x_text_out8(tl_x, (y+=10), "CDDA audio (using mp3s)    %s", (currentConfig.PicoOpt&0x800)?"ON":"OFF"); // 4
-	gp2x_text_out8(tl_x, (y+=10), "PCM audio                  %s", (currentConfig.PicoOpt&0x400)?"ON":"OFF"); // 5
+	gp2x_text_out8(tl_x, (y+=10), "CD LEDs                    %s", (currentConfig.EmuOpt &0x0400)?"ON":"OFF"); // 3
+	gp2x_text_out8(tl_x, (y+=10), "CDDA audio (using mp3s)    %s", (currentConfig.PicoOpt&0x0800)?"ON":"OFF"); // 4
+	gp2x_text_out8(tl_x, (y+=10), "PCM audio                  %s", (currentConfig.PicoOpt&0x0400)?"ON":"OFF"); // 5
+	gp2x_text_out8(tl_x, (y+=10), "ReadAhead buffer      %s", ra_buff); // 6
+	gp2x_text_out8(tl_x, (y+=10), "Scale/Rot. fx (buggy,slow) %s", (currentConfig.PicoOpt&0x1000)?"ON":"OFF"); // 7
+	gp2x_text_out8(tl_x, (y+=10), "Better sync (slow)         %s", (currentConfig.PicoOpt&0x2000)?"ON":"OFF"); // 8
 	gp2x_text_out8(tl_x, (y+=10), "Done");
 
 	// draw cursor
@@ -706,7 +762,7 @@ static void draw_cd_menu_options(int menu_sel, char *b_us, char *b_eu, char *b_j
 
 static void cd_menu_loop_options(void)
 {
-	int menu_sel = 0, menu_sel_max = 6;
+	int menu_sel = 0, menu_sel_max = 9;
 	unsigned long inp = 0;
 	char bios_us[32], bios_eu[32], bios_jp[32], *bios, *p;
 
@@ -733,10 +789,22 @@ static void cd_menu_loop_options(void)
 		if(inp & GP2X_DOWN) { menu_sel++; if (menu_sel > menu_sel_max) menu_sel = 0; }
 		if((inp& GP2X_B)||(inp&GP2X_LEFT)||(inp&GP2X_RIGHT)) { // toggleable options
 			switch (menu_sel) {
-				case  3: currentConfig.EmuOpt ^=0x400; break;
-				case  4: currentConfig.PicoOpt^=0x800; break;
-				case  5: currentConfig.PicoOpt^=0x400; break;
-				case  6: return;
+				case  3: currentConfig.EmuOpt ^=0x0400; break;
+				case  4: currentConfig.PicoOpt^=0x0800; break;
+				case  5: currentConfig.PicoOpt^=0x0400; break;
+				case  6:
+					if (inp & GP2X_LEFT) {
+						PicoCDBuffers >>= 1;
+						if (PicoCDBuffers < 64) PicoCDBuffers = 0;
+					} else {
+						if (PicoCDBuffers < 64) PicoCDBuffers = 64;
+						else PicoCDBuffers <<= 1;
+						if (PicoCDBuffers > 4096) PicoCDBuffers = 4096;
+					}
+					break;
+				case  7: currentConfig.PicoOpt^=0x1000; break;
+				case  8: currentConfig.PicoOpt^=0x2000; break;
+				case  9: return;
 			}
 		}
 		if(inp & (GP2X_X|GP2X_A)) return;
@@ -1104,6 +1172,8 @@ static void draw_menu_root(int menu_sel)
 	gp2x_text_out8(tl_x, (y+=10), "Configure controls");
 	gp2x_text_out8(tl_x, (y+=10), "Credits");
 	gp2x_text_out8(tl_x, (y+=10), "Exit");
+	if (PicoPatches)
+		gp2x_text_out8(tl_x, (y+=10), "Patches / GameGenie");
 
 	// draw cursor
 	gp2x_text_out8(tl_x - 16, tl_y + menu_sel*10, ">");
@@ -1131,6 +1201,7 @@ static void menu_loop_root(void)
 	}
 
 	if (rom_data) menu_sel = menu_sel_min = 0;
+	if (PicoPatches) menu_sel_max = 9;
 
 	for(;;)
 	{
@@ -1197,6 +1268,14 @@ static void menu_loop_root(void)
 				case 8: // exit
 					engineState = PGS_Quit;
 					return;
+				case 9: // patches/gg
+					if (rom_data && PicoPatches) {
+						patches_menu_loop();
+						PicoPatchApply();
+						strcpy(menuErrorMsg, "Patches applied");
+						continue;
+					}
+					break;
 			}
 		}
 		menuErrorMsg[0] = 0; // clear error msg