X-Git-Url: http://shamusworld.gotdns.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;ds=inline;f=src%2Fgui%2Fmainwin.cpp;h=d05599d35c2bdb3817f08d2743a51707c28023e3;hb=55f198414bda52449f1aa3c375419d4638a96f50;hp=3a4a6207f4d70af8e075e86ce6a775122181afdc;hpb=725caa0f8bb826a73edef366906ccb41a3197819;p=virtualjaguar

diff --git a/src/gui/mainwin.cpp b/src/gui/mainwin.cpp
index 3a4a620..d05599d 100644
--- a/src/gui/mainwin.cpp
+++ b/src/gui/mainwin.cpp
@@ -567,12 +567,27 @@ void MainWin::HandleKeys(QKeyEvent * e, bool state)
 	else if (e->key() == (int)vjs.p2KeyBindings[BUTTON_D])
 		keyHeld[P2DOWN] = state;
 
+#if 0
 	// Next, check for conflicts and bail out if there are any...
 	if ((keyHeld[P1LEFT] && keyHeld[P1RIGHT])
 		|| (keyHeld[P1UP] && keyHeld[P1DOWN])
 		|| (keyHeld[P2LEFT] && keyHeld[P2RIGHT])
 		|| (keyHeld[P2UP] && keyHeld[P2DOWN]))
 		return;
+#else
+	// Next, check for conflicts and kill 'em if there are any...
+	if (keyHeld[P1LEFT] && keyHeld[P1RIGHT])
+		keyHeld[P1LEFT] = keyHeld[P1RIGHT] = false;
+
+	if (keyHeld[P1UP] && keyHeld[P1DOWN])
+		keyHeld[P1UP] = keyHeld[P1DOWN] = false;
+
+	if (keyHeld[P2LEFT] && keyHeld[P2RIGHT])
+		keyHeld[P2LEFT] = keyHeld[P2RIGHT] = false;
+
+	if (keyHeld[P2UP] && keyHeld[P2DOWN])
+		keyHeld[P2UP] = keyHeld[P2DOWN] = false;
+#endif
 #endif
 #endif
 
@@ -1124,7 +1139,7 @@ void MainWin::ReadSettings(void)
 	vjs.frameSkip        = settings.value("frameSkip", 0).toInt();
 	vjs.useJaguarBIOS    = settings.value("useJaguarBIOS", false).toBool();
 	vjs.GPUEnabled       = settings.value("GPUEnabled", true).toBool();
-	vjs.DSPEnabled       = settings.value("DSPEnabled", false).toBool();
+	vjs.DSPEnabled       = settings.value("DSPEnabled", true).toBool();
 	vjs.audioEnabled     = settings.value("audioEnabled", true).toBool();
 	vjs.usePipelinedDSP  = settings.value("usePipelinedDSP", false).toBool();
 	vjs.fullscreen       = settings.value("fullscreen", false).toBool();
@@ -1133,6 +1148,7 @@ void MainWin::ReadSettings(void)
 	vjs.renderType       = settings.value("renderType", 0).toInt();
 	vjs.allowWritesToROM = settings.value("writeROM", false).toBool();
 	vjs.biosType         = settings.value("biosType", BT_M_SERIES).toInt();
+	vjs.useFastBlitter   = settings.value("useFastBlitter", false).toBool();
 	strcpy(vjs.EEPROMPath, settings.value("EEPROMs", "./eeproms/").toString().toAscii().data());
 	strcpy(vjs.ROMPath, settings.value("ROMs", "./software/").toString().toAscii().data());
 	strcpy(vjs.alpineROMPath, settings.value("DefaultROM", "").toString().toAscii().data());
@@ -1220,6 +1236,7 @@ void MainWin::WriteSettings(void)
 	settings.setValue("renderType", vjs.renderType);
 	settings.setValue("writeROM", vjs.allowWritesToROM);
 	settings.setValue("biosType", vjs.biosType);
+	settings.setValue("useFastBlitter", vjs.useFastBlitter);
 	settings.setValue("JagBootROM", vjs.jagBootPath);
 	settings.setValue("CDBootROM", vjs.CDBootPath);
 	settings.setValue("EEPROMs", vjs.EEPROMPath);