X-Git-Url: http://shamusworld.gotdns.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Fgui%2Fmainwin.cpp;fp=src%2Fgui%2Fmainwin.cpp;h=d05599d35c2bdb3817f08d2743a51707c28023e3;hb=55f198414bda52449f1aa3c375419d4638a96f50;hp=482b9cdff9e8176d7f309c3edef04c9882a64f7c;hpb=f005034d4a3990efc8e445ce46222ce32600411b;p=virtualjaguar

diff --git a/src/gui/mainwin.cpp b/src/gui/mainwin.cpp
index 482b9cd..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