X-Git-Url: https://notaz.gp2x.de/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=gp2x%2Fmenu.c;h=919fdb9b73af6cf5bdccfd73dbcfaa96a211d987;hb=30d5518a0b02afafea4ced92f991838b031d0aad;hp=55995b9e7d9063d1c4651eb30fb1a47dfca66382;hpb=558d8e1fdd54558c58fe5f661369f76458e1addc;p=libpicofe.git

diff --git a/gp2x/menu.c b/gp2x/menu.c
index 55995b9..919fdb9 100644
--- a/gp2x/menu.c
+++ b/gp2x/menu.c
@@ -30,7 +30,7 @@
 
 extern int  mmuhack_status;
 
-const char *keyNames[] = {
+const char * const keyNames[] = {
 	"UP",    "???",    "LEFT", "???",  "DOWN", "???", "RIGHT",    "???",
 	"START", "SELECT", "L",    "R",    "A",    "B",   "X",        "Y",
 	"???",   "???",    "???",  "???",  "???",  "???", "VOL DOWN", "VOL UP",
@@ -553,7 +553,7 @@ static void draw_savestate_bg(int slot)
 	}
 
 	if (file) {
-		if (PicoMCD & 1) {
+		if (PicoAHW & PAHW_MCD) {
 			PicoCdLoadStateGfx(file);
 		} else {
 			areaSeek(file, 0x10020, SEEK_SET);  // skip header and RAM in state file
@@ -878,7 +878,7 @@ static void kc_sel_loop(void)
 {
 	int menu_sel = 3, menu_sel_max = 3;
 	unsigned long inp = 0;
-	int is_6button = PicoOpt & 0x020;
+	int is_6button = PicoOpt & POPT_6BTN_PAD;
 
 	while (1)
 	{
@@ -918,8 +918,8 @@ menu_entry cdopt_entries[] =
 	{ "done",                      MB_NONE,  MA_CDOPT_DONE,         NULL, 0, 0, 0, 1, 0 },
 };
 
-const int cdopt_entry_count = (sizeof(cdopt_entries) / sizeof(cdopt_entries[0]));
 #define CDOPT_ENTRY_COUNT (sizeof(cdopt_entries) / sizeof(cdopt_entries[0]))
+const int cdopt_entry_count = CDOPT_ENTRY_COUNT;
 
 
 struct bios_names_t
@@ -1059,6 +1059,7 @@ menu_entry opt2_entries[] =
 	{ NULL,                        MB_NONE,  MA_OPT2_GAMMA,         NULL, 0, 0, 0, 1, 1 },
 	{ "A_SN's gamma curve",        MB_ONOFF, MA_OPT2_A_SN_GAMMA,    &currentConfig.EmuOpt, 0x1000, 0, 0, 1, 1 },
 	{ "Perfect vsync",             MB_ONOFF, MA_OPT2_VSYNC,         &currentConfig.EmuOpt, 0x2000, 0, 0, 1, 1 },
+	{ "Disable sprite limit",      MB_ONOFF, MA_OPT2_NO_SPRITE_LIM, &PicoOpt, 0x40000, 0, 0, 1, 1 },
 	{ "Emulate Z80",               MB_ONOFF, MA_OPT2_ENABLE_Z80,    &PicoOpt, 0x00004, 0, 0, 1, 1 },
 	{ "Emulate YM2612 (FM)",       MB_ONOFF, MA_OPT2_ENABLE_YM2612, &PicoOpt, 0x00001, 0, 0, 1, 1 },
 	{ "Emulate SN76496 (PSG)",     MB_ONOFF, MA_OPT2_ENABLE_SN76496,&PicoOpt, 0x00002, 0, 0, 1, 1 },
@@ -1072,7 +1073,7 @@ menu_entry opt2_entries[] =
 };
 
 #define OPT2_ENTRY_COUNT (sizeof(opt2_entries) / sizeof(opt2_entries[0]))
-const int opt2_entry_count = (sizeof(opt2_entries) / sizeof(opt2_entries[0]));
+const int opt2_entry_count = OPT2_ENTRY_COUNT;
 
 static void menu_opt2_cust_draw(const menu_entry *entry, int x, int y, void *param)
 {
@@ -1173,7 +1174,7 @@ static void menu_opt_cust_draw(const menu_entry *entry, int x, int y, void *para
 	switch (entry->id)
 	{
 		case MA_OPT_RENDERER:
-			if (PicoOpt&0x10)
+			if (PicoOpt & POPT_ALT_RENDERER)
 				str = " 8bit fast";
 			else if (currentConfig.EmuOpt&0x80)
 				str = "16bit accurate";
@@ -1197,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);
 			break;
 		case MA_OPT_SOUND_QUALITY:
-			str = (PicoOpt&0x08)?"stereo":"mono";
+			str = (PicoOpt & POPT_EN_STEREO) ? "stereo" : "mono";
 			text_out16(x, y, "Sound Quality:     %5iHz %s", PsndRate, str);
 			break;
 		case MA_OPT_REGION:
@@ -1287,7 +1288,7 @@ static void menu_options_save(void)
 		// force setting possibly changed..
 		Pico.m.pal = (PicoRegionOverride == 2 || PicoRegionOverride == 8) ? 1 : 0;
 	}
-	if (!(PicoOpt & 0x20)) {
+	if (!(PicoOpt & POPT_6BTN_PAD)) {
 		// unbind XYZ MODE, just in case
 		unbind_action(0xf00, -1, -1);
 	}
@@ -1424,7 +1425,7 @@ static void draw_menu_credits(void)
 	int tl_x = 15, tl_y = 64, y;
 	gp2x_pd_clone_buffer2();
 
-	text_out16(tl_x, 20, "PicoDrive v" VERSION " (c) notaz, 2006,2007");
+	text_out16(tl_x, 20, "PicoDrive v" VERSION " (c) notaz, 2006-2008");
 	y = tl_y;
 	text_out16(tl_x, y, "Credits:");
 	text_out16(tl_x, (y+=10), "fDave: Cyclone 68000 core,");