X-Git-Url: https://notaz.gp2x.de/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=platform%2Fgp2x%2Fmenu.c;h=22752796564b93c9f423fdbbfdcc50f0b78ad057;hb=1bb6f3cb23f6844fdbddc86add131a623661b1f7;hp=881ea98e1c5a172b6fa630da9c9a88e38b2a2189;hpb=721cd3963fa4ba82ca218345e8f543703dc46c90;p=picodrive.git

diff --git a/platform/gp2x/menu.c b/platform/gp2x/menu.c
index 881ea98..2275279 100644
--- a/platform/gp2x/menu.c
+++ b/platform/gp2x/menu.c
@@ -772,8 +772,9 @@ static void draw_cd_menu_options(int menu_sel, char *b_us, char *b_eu, char *b_j
 	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 (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), "SaveRAM cart               %s", (currentConfig.PicoOpt&0x8000)?"ON":"OFF"); // 7
+	gp2x_text_out8(tl_x, (y+=10), "Scale/Rot. fx (slow)       %s", (currentConfig.PicoOpt&0x1000)?"ON":"OFF"); // 8
+	gp2x_text_out8(tl_x, (y+=10), "Better sync (slow)         %s", (currentConfig.PicoOpt&0x2000)?"ON":"OFF"); // 9
 	gp2x_text_out8(tl_x, (y+=10), "Done");
 
 	// draw cursor
@@ -789,7 +790,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 = 9;
+	int menu_sel = 0, menu_sel_max = 10;
 	unsigned long inp = 0;
 	char bios_us[32], bios_eu[32], bios_jp[32], *bios, *p;
 
@@ -829,9 +830,10 @@ static void cd_menu_loop_options(void)
 						if (PicoCDBuffers > 8*1024) PicoCDBuffers = 8*1024; // 16M
 					}
 					break;
-				case  7: currentConfig.PicoOpt^=0x1000; break;
-				case  8: currentConfig.PicoOpt^=0x2000; break;
-				case  9: return;
+				case  7: currentConfig.PicoOpt^=0x8000; break;
+				case  8: currentConfig.PicoOpt^=0x1000; break;
+				case  9: currentConfig.PicoOpt^=0x2000; break;
+				case 10: return;
 			}
 		}
 		if(inp & (GP2X_X|GP2X_A)) return;
@@ -956,7 +958,7 @@ static const char *region_name(unsigned int code)
 static void draw_menu_options(int menu_sel)
 {
 	int tl_x = 25, tl_y = 32, y;
-	char monostereo[8], strframeskip[8], *strrend, *strscaling;
+	char monostereo[8], strframeskip[8], *strrend, *strscaling, *strssconfirm;
 
 	strcpy(monostereo, (currentConfig.PicoOpt&0x08)?"stereo":"mono");
 	if (currentConfig.Frameskip < 0)
@@ -975,6 +977,12 @@ static void draw_menu_options(int menu_sel)
 		case 2:  strscaling = "hw horiz. + vert."; break;
 		case 3:  strscaling = "sw horizontal";     break;
 	}
+	switch ((currentConfig.EmuOpt >> 9) & 5) {
+		default: strssconfirm = "OFF";    break;
+		case 1:  strssconfirm = "writes"; break;
+		case 4:  strssconfirm = "loads";  break;
+		case 5:  strssconfirm = "both";   break;
+	}
 
 	y = tl_y;
 	//memset(gp2x_screen, 0, 320*240);
@@ -990,9 +998,9 @@ static void draw_menu_options(int menu_sel)
 	gp2x_text_out8(tl_x, (y+=10), "Sound Quality:     %5iHz %s",   currentConfig.PsndRate, monostereo);
 	gp2x_text_out8(tl_x, (y+=10), "Use ARM940 core for sound  %s", (currentConfig.PicoOpt&0x200)?"ON":"OFF"); // 8
 	gp2x_text_out8(tl_x, (y+=10), "6 button pad               %s", (currentConfig.PicoOpt&0x020)?"ON":"OFF"); // 9
-	gp2x_text_out8(tl_x, (y+=10), "Genesis Region:      %s",       region_name(currentConfig.PicoRegion));
+	gp2x_text_out8(tl_x, (y+=10), "Region:              %s",       region_name(currentConfig.PicoRegion));
 	gp2x_text_out8(tl_x, (y+=10), "Use SRAM/BRAM savestates   %s", (currentConfig.EmuOpt &0x001)?"ON":"OFF"); // 11
-	gp2x_text_out8(tl_x, (y+=10), "Confirm save overwrites    %s", (currentConfig.EmuOpt &0x200)?"ON":"OFF"); // 12
+	gp2x_text_out8(tl_x, (y+=10), "Confirm savestate          %s", strssconfirm); // 12
 	gp2x_text_out8(tl_x, (y+=10), "Save slot                  %i", state_slot); // 13
 	gp2x_text_out8(tl_x, (y+=10), "GP2X CPU clocks            %iMhz", currentConfig.CPUclock);
 	gp2x_text_out8(tl_x, (y+=10), "[Sega/Mega CD options]");
@@ -1083,7 +1091,6 @@ static int menu_loop_options(void)
 				case  8: currentConfig.PicoOpt^=0x200; break;
 				case  9: currentConfig.PicoOpt^=0x020; break;
 				case 11: currentConfig.EmuOpt ^=0x001; break;
-				case 12: currentConfig.EmuOpt ^=0x200; break;
 				case 15: cd_menu_loop_options();
 					if (engineState == PGS_ReloadRom)
 						return 0; // test BIOS
@@ -1138,6 +1145,15 @@ static int menu_loop_options(void)
 				case 10:
 					region_prevnext(inp & GP2X_RIGHT);
 					break;
+				case 12: {
+					int n = ((currentConfig.EmuOpt>>9)&1) | ((currentConfig.EmuOpt>>10)&2);
+					n += (inp & GP2X_LEFT) ? -1 : 1;
+					if (n < 0) n = 0; else if (n > 3) n = 3;
+					n |= n << 1; n &= ~2;
+					currentConfig.EmuOpt &= ~0xa00;
+					currentConfig.EmuOpt |= n << 9;
+					break;
+				}
 				case 13:
 					if (inp & GP2X_RIGHT) {
 						state_slot++; if (state_slot > 9) state_slot = 0;