X-Git-Url: http://shamusworld.gotdns.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Fjoystick.cpp;h=25aef85b2a23e1a72c14d2853c4988649a7ca864;hb=c9d57b57d70ab2ae842144828175820fb207a3b0;hp=4b2549384fc9d9fa311edf254399782381f5fbf4;hpb=d207b11e613703aff7d00191c4595b7359f29700;p=virtualjaguar diff --git a/src/joystick.cpp b/src/joystick.cpp index 4b25493..25aef85 100644 --- a/src/joystick.cpp +++ b/src/joystick.cpp @@ -137,7 +137,7 @@ uint16_t JoystickReadWord(uint32_t offset) if (offset0 != 0xFF) { offset0 /= 4; // Make index 0, 1, 2, 3 instead of 0, 4, 8, 12 - uint8_t mask[4][2] = { { BUTTON_A, BUTTON_PAUSE }, { BUTTON_B, -1 }, { BUTTON_C, -1 }, { BUTTON_OPTION, -1 } }; + uint8_t mask[4][2] = { { BUTTON_A, BUTTON_PAUSE }, { BUTTON_B, 0xFF }, { BUTTON_C, 0xFF }, { BUTTON_OPTION, 0xFF } }; data &= (joypad0Buttons[mask[offset0][0]] ? 0xFFFD : 0xFFFF); if (mask[offset0][1] != -1) @@ -147,7 +147,7 @@ uint16_t JoystickReadWord(uint32_t offset) if (offset1 != 0xFF) { offset1 /= 4; // Make index 0, 1, 2, 3 instead of 0, 4, 8, 12 - uint8_t mask[4][2] = { { BUTTON_A, BUTTON_PAUSE }, { BUTTON_B, -1 }, { BUTTON_C, -1 }, { BUTTON_OPTION, -1 } }; + uint8_t mask[4][2] = { { BUTTON_A, BUTTON_PAUSE }, { BUTTON_B, 0xFF }, { BUTTON_C, 0xFF }, { BUTTON_OPTION, 0xFF } }; data &= (joypad1Buttons[mask[offset1][0]] ? 0xFFF7 : 0xFFFF); if (mask[offset1][1] != -1)