Added analog axis support to Gamepad module.

[virtualjaguar] / src / gui / mainwin.cpp

diff --git a/src/gui/mainwin.cpp b/src/gui/mainwin.cpp
index 87e6e3fa16642e78b0cfb864c04961ec0ec6936b..0e19488f9eeed77ee44423c24be5a07ded56de65 100644 (file)
--- a/src/gui/mainwin.cpp
+++ b/src/gui/mainwin.cpp
@@ -346,8 +346,6 @@ MainWin::MainWin(bool autoRun): running(true), powerButtonOn(false),
                // Prevent the scanner from running...
                return;
        }
-//     else
-//             memcpy(jagMemSpace + 0xE00000, jaguarBootROM, 0x20000); // Otherwise, use the stock BIOS
 
        // Run the scanner if nothing passed in and *not* Alpine mode...
        // NB: Really need to look into caching the info scanned in here...
@@ -523,10 +521,10 @@ void MainWin::HandleGamepads(void)
 
        for(int i=BUTTON_FIRST; i<=BUTTON_LAST; i++)
        {
-               if (vjs.p1KeyBindings[i] & (JOY_BUTTON | JOY_HAT))
+               if (vjs.p1KeyBindings[i] & (JOY_BUTTON | JOY_HAT | JOY_AXIS))
                        joypad_0_buttons[i] = (Gamepad::GetState(0, vjs.p1KeyBindings[i]) ? 0x01 : 0x00);
 
-               if (vjs.p2KeyBindings[i] & (JOY_BUTTON | JOY_HAT))
+               if (vjs.p2KeyBindings[i] & (JOY_BUTTON | JOY_HAT | JOY_AXIS))
                        joypad_1_buttons[i] = (Gamepad::GetState(1, vjs.p2KeyBindings[i]) ? 0x01 : 0x00);
        }
 }