X-Git-Url: http://shamusworld.gotdns.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Fjoystick.cpp;h=894301d9b99bccea78044dbe24988e347b88b00b;hb=ee44841002db3b2475ce02619d141aee6631242b;hp=dc498d02134d87aeaeca92acb5d01185e8ef3203;hpb=5da604521611a960140b58a2fb0f236c65610b70;p=virtualjaguar diff --git a/src/joystick.cpp b/src/joystick.cpp index dc498d0..894301d 100644 --- a/src/joystick.cpp +++ b/src/joystick.cpp @@ -325,6 +325,9 @@ void JoystickDone(void) uint8 JoystickReadByte(uint32 offset) { +// For now, until we can fix the 2nd controller... :-P +memset(joypad_1_buttons, 0, 21); + #warning "No bounds checking done in JoystickReadByte!" // extern bool hardwareTypeNTSC; offset &= 0x03; @@ -377,6 +380,7 @@ uint8 JoystickReadByte(uint32 offset) //unused int pad1Index = (joystick_ram[1] >> 4) & 0x0F; //WTF is this shit? +#warning "!!! What is this? !!!" if (!(pad0Index & 0x01)) { if (joypad_0_buttons[BUTTON_PAUSE])