input fully ported!! it is a bit buggy but it works!!

[16.git] / src / inputest.c

diff --git a/src/inputest.c b/src/inputest.c
index 9693104657c8cae19a318d09d173bf53caf6db17..d4a3d44c50f6150bda75fbf381b1a3a2c0773787 100644 (file)
--- a/src/inputest.c
+++ b/src/inputest.c
@@ -26,21 +26,34 @@
 \r
 void\r
 main(int argc, char *argv[])\r
-{\r
-//     CursorInfo control;
+{
        player_t player[MaxPlayers];
-       hwconfig hw;
-       player.KbdDefs = {0x1d,0x38,0x47,0x48,0x49,0x4b,0x4d,0x4f,0x50,0x51};
+       inconfig in;
+       //word i=0;
 \r
-       extern boolean Keyboard[NumCodes];\r
-       IN_Startup();
-       IN_Default(0,&player,ctrl_Joystick);\r
-//     IN_Default(0,ctrl_Joystick);\r
-       while(!IN_qb(sc_Escape))\r
-       {\r
-               IN_ReadControl(0,&control);\r
-//             printf("%u\n", Keyboard[sc_Escape]);\r
+       in.KbdDefs[0].button0 = 0x1d;
+       in.KbdDefs[0].button1 = 0x38;
+       //in.KbdDefs[0].upleft = 0x47;
+       in.KbdDefs[0].up = 0x48;
+       //in.KbdDefs[0].upright = 0x49;
+       in.KbdDefs[0].left = 0x4b;
+       in.KbdDefs[0].right = 0x4d;
+       //in.KbdDefs[0].downleft = 0x4f;
+       in.KbdDefs[0].down = 0x50;
+       //in.KbdDefs[0].downright = 0x51;
 \r
-       }\r
-       IN_Shutdown();\r
+       if(IN_Startup(&in))
+       {
+               IN_Default(0,&player,ctrl_Joystick, &in);\r
+               while(!in.Keyboard[sc_Escape])\r
+               {
+                       IN_ReadControl(0,&player, &in);\r
+                       //printf("%u\n", in.Keyboard[sc_Escape]);
+                       //printf("i=%u\n", i);
+                       printf("");
+                       //i++;\r
+               }
+               IN_Shutdown(&in);
+       }
+       //printf("%u\n", in.Keyboard[sc_Escape]);\r
 }\r