X-Git-Url: http://shamusworld.gotdns.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Fgui%2Fmainwin.cpp;h=02da8c7ba3c8adf289fa29f201fe985474f7a8e6;hb=c436dad60e34fb9da720a89db917eb4cf4e3a624;hp=6becf8eb13816b1b7eae77d4ec568ce2155a36a0;hpb=94d59c2c8c14b9ac51dffd117ec507418b4d0881;p=virtualjaguar

diff --git a/src/gui/mainwin.cpp b/src/gui/mainwin.cpp
index 6becf8e..02da8c7 100644
--- a/src/gui/mainwin.cpp
+++ b/src/gui/mainwin.cpp
@@ -539,13 +539,13 @@ void MainWin::HandleKeys(QKeyEvent * e, bool state)
 	{
 		if (e->key() == (int)vjs.p1KeyBindings[i])
 //			joypad_0_buttons[i] = (uint8)state;
-			joypad_0_buttons[i] = (state ? 0x01 : 0x00);
+			joypad0Buttons[i] = (state ? 0x01 : 0x00);
 
 // Pad #2 is screwing up pad #1. Prolly a problem in joystick.cpp...
 // So let's try to fix it there. :-P [DONE]
 		if (e->key() == (int)vjs.p2KeyBindings[i])
 //			joypad_1_buttons[i] = (uint8)state;
-			joypad_1_buttons[i] = (state ? 0x01 : 0x00);
+			joypad1Buttons[i] = (state ? 0x01 : 0x00);
 	}
 }
 
@@ -557,10 +557,10 @@ void MainWin::HandleGamepads(void)
 	for(int i=BUTTON_FIRST; i<=BUTTON_LAST; i++)
 	{
 		if (vjs.p1KeyBindings[i] & (JOY_BUTTON | JOY_HAT | JOY_AXIS))
-			joypad_0_buttons[i] = (Gamepad::GetState(0, vjs.p1KeyBindings[i]) ? 0x01 : 0x00);
+			joypad0Buttons[i] = (Gamepad::GetState(0, vjs.p1KeyBindings[i]) ? 0x01 : 0x00);
 
 		if (vjs.p2KeyBindings[i] & (JOY_BUTTON | JOY_HAT | JOY_AXIS))
-			joypad_1_buttons[i] = (Gamepad::GetState(1, vjs.p2KeyBindings[i]) ? 0x01 : 0x00);
+			joypad1Buttons[i] = (Gamepad::GetState(1, vjs.p2KeyBindings[i]) ? 0x01 : 0x00);
 	}
 }