X-Git-Url: https://notaz.gp2x.de/cgi-bin/gitweb.cgi?p=pcsx_rearmed.git;a=blobdiff_plain;f=frontend%2Fmenu.c;h=3152cb2ec7343bb799e5ce8be349e1f9c66b6874;hp=7cdfe390759557daead49f2b381f45bfd233e20e;hb=00a5d4598d4a79e0041ce958fe65a4c20338b6cc;hpb=ab423939f0af46542bb23000e77a30976c8c2335

diff --git a/frontend/menu.c b/frontend/menu.c
index 7cdfe390..3152cb2e 100644
--- a/frontend/menu.c
+++ b/frontend/menu.c
@@ -106,8 +106,6 @@ int filter;
 extern int iUseReverb;
 extern int iUseInterpolation;
 extern int iXAPitch;
-extern int iSPUIRQWait;
-extern int iUseTimer;
 extern int iVolume;
 
 static const char *bioses[24];
@@ -308,8 +306,6 @@ static const struct {
 	CE_INTVAL_V(iUseReverb, 3),
 	CE_INTVAL_V(iXAPitch, 3),
 	CE_INTVAL_V(iUseInterpolation, 3),
-	CE_INTVAL_V(iSPUIRQWait, 3),
-	CE_INTVAL_V(iUseTimer, 3),
 	CE_INTVAL(warned_about_bios),
 	CE_INTVAL(in_evdev_allow_abs_only),
 	CE_INTVAL(volume_boost),
@@ -594,7 +590,7 @@ static void draw_savestate_bg(int slot)
 
 	x = gpu->ulControl[5] & 0x3ff;
 	y = (gpu->ulControl[5] >> 10) & 0x1ff;
-	s = (u16 *)gpu->psxVRam + y * 1024 + (x & ~1);
+	s = (u16 *)gpu->psxVRam + y * 1024 + x;
 	w = psx_widths[(gpu->ulStatus >> 16) & 7];
 	tmp = gpu->ulControl[7];
 	h = ((tmp >> 10) & 0x3ff) - (tmp & 0x3ff);
@@ -1215,8 +1211,6 @@ static int menu_loop_plugin_gpu_peopsgl(int id, int keys)
 
 static const char *men_spu_interp[] = { "None", "Simple", "Gaussian", "Cubic", NULL };
 static const char h_spu_volboost[]  = "Large values cause distortion";
-static const char h_spu_irq_wait[]  = "Wait for CPU (recommended set to ON)";
-static const char h_spu_thread[]    = "Run sound emulation in main thread (recommended)";
 
 static menu_entry e_menu_plugin_spu[] =
 {
@@ -1224,8 +1218,6 @@ static menu_entry e_menu_plugin_spu[] =
 	mee_onoff     ("Reverb",                    0, iUseReverb, 2),
 	mee_enum      ("Interpolation",             0, iUseInterpolation, men_spu_interp),
 	mee_onoff     ("Adjust XA pitch",           0, iXAPitch, 1),
-	mee_onoff_h   ("SPU IRQ Wait",              0, iSPUIRQWait, 1, h_spu_irq_wait),
-	mee_onoff_h   ("Sound in main thread",      0, iUseTimer, 2, h_spu_thread),
 	mee_end,
 };
 
@@ -1452,8 +1444,8 @@ static void debug_menu_loop(void)
 		if      (inp & PBTN_MBACK) break;
 		else if (inp & PBTN_UP)    { if (df_y > 0) df_y--; }
 		else if (inp & PBTN_DOWN)  { if (df_y < 512 - g_menuscreen_h) df_y++; }
-		else if (inp & PBTN_LEFT)  { if (df_x > 0) df_x--; }
-		else if (inp & PBTN_RIGHT) { if (df_x < 1024 - g_menuscreen_w) df_x++; }
+		else if (inp & PBTN_LEFT)  { if (df_x > 0) df_x -= 2; }
+		else if (inp & PBTN_RIGHT) { if (df_x < 1024 - g_menuscreen_w) df_x += 2; }
 	}
 
 	free(gpuf);
@@ -2250,7 +2242,7 @@ static void menu_leave_emu(void)
 		}
 		else {
 			for (; h > 0; h--, d += g_menuscreen_w, s += last_psx_w * 3) {
-				bgr888_to_rgb565(d, s, w * 3);
+				rgb888_to_rgb565(d, s, w * 3);
 				menu_darken_bg(d, d, w, 0);
 			}
 		}