Removed joy_masks array.

[cc65] / testcode / lib / pce / conio.c

diff --git a/testcode/lib/pce/conio.c b/testcode/lib/pce/conio.c
index 00ae3c15770a2b621d5f79d6b486a92778bc67fa..ed3f86240446984b2250c54d2ae6a4337d82f440 100644 (file)
--- a/testcode/lib/pce/conio.c
+++ b/testcode/lib/pce/conio.c
@@ -1,3 +1,4 @@
+#include <pce.h>
 #include <conio.h>
 #include <time.h>
 #include <joystick.h>
@@ -97,14 +98,14 @@ void main(void)
                         j = joy_read (i);
                         cprintf ("pad %d: %02x %-6s%-6s%-6s%-6s%-6s%-6s%-6s%-6s",
                                 i, j,
-                                (j & joy_masks[JOY_UP])?    "  up  " : " ---- ",
-                                (j & joy_masks[JOY_DOWN])?  " down " : " ---- ",
-                                (j & joy_masks[JOY_LEFT])?  " left " : " ---- ",
-                                (j & joy_masks[JOY_RIGHT])? "right " : " ---- ",
-                                (j & joy_masks[JOY_FIRE])?  " fire " : " ---- ",
-                                (j & joy_masks[JOY_FIRE2])? "fire2 " : " ---- ",
-                                (j & joy_masks[JOY_SELECT])? "select" : " ---- ",
-                                (j & joy_masks[JOY_RUN])?   " run  " : " ---- ");
+                                JOY_UP(j)?     "  up  " : " ---- ",
+                                JOY_DOWN(j)?   " down " : " ---- ",
+                                JOY_LEFT(j)?   " left " : " ---- ",
+                                JOY_RIGHT(j)?  "right " : " ---- ",
+                                JOY_BTN_I(j)?  "btn I " : " ---- ",
+                                JOY_BTN_II(j)? "btn II" : " ---- ",
+                                JOY_SELECT(j)? "select" : " ---- ",
+                                JOY_RUN(j)?    " run  " : " ---- ");
                 }
 
                 gotoxy(xsize - 10, 3);