X-Git-Url: http://shamusworld.gotdns.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Fgui%2Fmainwin.cpp;h=892fb1fec0bdbab4b21bd3fcc5ad36d3f4ad7577;hb=0c6ed444bbb07e5cc0513a7d3075fb24d06e61eb;hp=83d0a53855adcd33c3a1812f226be80d39e3c2e3;hpb=62b541c6c09933ea0daf800ecd86467f6f15b584;p=virtualjaguar

diff --git a/src/gui/mainwin.cpp b/src/gui/mainwin.cpp
index 83d0a53..892fb1f 100644
--- a/src/gui/mainwin.cpp
+++ b/src/gui/mainwin.cpp
@@ -274,6 +274,8 @@ MainWin::MainWin(): running(false), powerButtonOn(false), showUntunedTankCircuit
 		// Attempt to load/run the ABS file...
 		LoadSoftware(vjs.absROMPath);
 	}
+	else
+		memcpy(jagMemSpace + 0xE00000, jaguarBootROM, 0x20000);	// Otherwise, use the stock BIOS
 }
 
 void MainWin::closeEvent(QCloseEvent * event)
@@ -314,6 +316,15 @@ void MainWin::HandleKeys(QKeyEvent * e, bool state)
 		joypad_0_buttons[BUTTON_D] = 0;
 	if (e->key() == (int)vjs.p1KeyBindings[BUTTON_D] && joypad_0_buttons[BUTTON_U])
 		joypad_0_buttons[BUTTON_U] = 0;
+
+	if (e->key() == (int)vjs.p2KeyBindings[BUTTON_L] && joypad_1_buttons[BUTTON_R])
+		joypad_0_buttons[BUTTON_R] = 0;
+	if (e->key() == (int)vjs.p2KeyBindings[BUTTON_R] && joypad_1_buttons[BUTTON_L])
+		joypad_0_buttons[BUTTON_L] = 0;
+	if (e->key() == (int)vjs.p2KeyBindings[BUTTON_U] && joypad_1_buttons[BUTTON_D])
+		joypad_0_buttons[BUTTON_D] = 0;
+	if (e->key() == (int)vjs.p2KeyBindings[BUTTON_D] && joypad_1_buttons[BUTTON_U])
+		joypad_0_buttons[BUTTON_U] = 0;
 #endif
 
 	// No bad combos exist, let's stuff the emulator key buffers...!
@@ -321,6 +332,9 @@ void MainWin::HandleKeys(QKeyEvent * e, bool state)
 	{
 		if (e->key() == (int)vjs.p1KeyBindings[i])
 			joypad_0_buttons[i] = (uint8)state;
+
+		if (e->key() == (int)vjs.p2KeyBindings[i])
+			joypad_1_buttons[i] = (uint8)state;
 	}
 }