X-Git-Url: http://shamusworld.gotdns.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Fjoystick.cpp;h=14b5ff784a8f737cd49b67daee9c06c36d996595;hb=dffa89ebdee4d328a8e166b30fcdf38a3fc54b28;hp=146c15d9e29c547ca5a77efecd58fad27abfb4d9;hpb=966763ef56b837b82cc3727dd95246ba6ae155ce;p=virtualjaguar diff --git a/src/joystick.cpp b/src/joystick.cpp index 146c15d..14b5ff7 100644 --- a/src/joystick.cpp +++ b/src/joystick.cpp @@ -3,10 +3,10 @@ // // by cal2 // GCC/SDL port by Niels Wagenaar (Linux/WIN32) and Caz (BeOS) -// Cleanups/fixes by James L. Hammons +// Cleanups/fixes by James Hammons // (C) 2010 Underground Software // -// JLH = James L. Hammons +// JLH = James Hammons // // Who When What // --- ---------- ------------------------------------------------------------- @@ -341,7 +341,10 @@ uint8 JoystickReadByte(uint32 offset) // This is bad--we're assuming that a bit is set in the last case. Might not be so! // NOTE: values $7, B, D, & E are only legal ones for pad 0, (rows 3 to 0, in both cases) // $E, D, B, & 7 are only legal ones for pad 1 -// So the following code is WRONG! +// So the following code is WRONG! (now fixed! ;-) +// Also: we should explicitly check for those bit patterns, as other patterns +// are legal and yield other controllers... !!! FIX !!! +#warning "!!! Need to explicitly check for the proper bit combinations! !!!" if (!(pad0Index & 0x01)) pad0Index = 0;