16_in improvements and added debugging stuff

[16.git] / src / lib / 16_in.c

diff --git a/src/lib/16_in.c b/src/lib/16_in.c
index c8072f1e429f74907c4af1e51ec2bfdfb0a69f67..062e3beef1dba3a4f18bd09bec4f8f5161de9da6 100755 (executable)
--- a/src/lib/16_in.c
+++ b/src/lib/16_in.c
@@ -38,7 +38,7 @@
 \r
 #include "src/lib/16_in.h"\r
 \r
-word testkeyin=1,testcontrolnoisy=0;\r
+byte testkeyin=0,testcontrolnoisy=0,gfxtest=0;\r
 \r
 /*\r
 =============================================================================\r
@@ -237,7 +237,7 @@ static      boolean special;
        if (INL_KeyHook && !special)\r
                INL_KeyHook();\r
 //#ifdef TESTKEYIN\r
-       if(testkeyin > 0) printf("%c [0x%x %u] %u\n", c, k, k, inpu.Keyboard[k]);\r
+       if(testkeyin > 0) printf("%c    [0x%x %u]       %u\n", c, k, k, inpu.Keyboard[k]);\r
 //endif\r
        outp(0x20,0x20);\r
 }\r
@@ -669,6 +669,7 @@ IN_Startup()
 void\r
 IN_Default(boolean gotit,player_t *player,ControlType nt)\r
 {\r
+       int i;\r
        if\r
        (\r
                (!gotit)\r
@@ -690,6 +691,8 @@ IN_Default(boolean gotit,player_t *player,ControlType nt)
        inpu.KbdDefs[0].down = 0x50;\r
        //in.KbdDefs[0].downright = 0x51;\r
        IN_SetControlType(0,player,nt);\r
+       for(i=0; i>MaxPlayers;i++)\r
+               player[i].d=2;\r
 }\r
 \r
 ///////////////////////////////////////////////////////////////////////////\r
@@ -800,7 +803,7 @@ IN_ReadCursor(CursorInfo *info)
 //\r
 ///////////////////////////////////////////////////////////////////////////\r
 void near\r
-IN_ReadControl(int playnum,player_t *player)\r
+IN_ReadControl(int pn,player_t *player)\r
 {\r
                        boolean         realdelta;\r
                        byte            dbyte;\r
@@ -837,7 +840,7 @@ register    KeyboardDef     *def;
        else\r
        {\r
 #endif\r
-               switch (type = player[playnum].Controls)\r
+               switch (type = player[pn].Controls)\r
                {\r
                case ctrl_Keyboard1:\r
                case ctrl_Keyboard2:\r
@@ -851,16 +854,21 @@ register  KeyboardDef     *def;
                                mx = motion_Left,my = motion_Down;\r
                        else if (Keyboard[def->downright])\r
                                mx = motion_Right,my = motion_Down;*/\r
-                       if(!inpu.Keyboard[def->left] && !inpu.Keyboard[def->right]){\r
-                       if((inpu.Keyboard[def->up] && !inpu.Keyboard[def->down] && player[playnum].d == 2))// || player[playnum].info.dir == 0)\r
-                               my = motion_Up;\r
-                       if((inpu.Keyboard[def->down] && !inpu.Keyboard[def->up] && player[playnum].d == 2))// || player[playnum].info.dir == 4)\r
-                               my = motion_Down;\r
-                       }else if(!inpu.Keyboard[def->up] && !inpu.Keyboard[def->down]){\r
-                       if((inpu.Keyboard[def->left] && !inpu.Keyboard[def->right] && player[playnum].d == 2))// || player[playnum].info.dir == 1)\r
-                               mx = motion_Left;\r
-                       if((inpu.Keyboard[def->right] && !inpu.Keyboard[def->left] && player[playnum].d == 2))// || player[playnum].info.dir == 3)\r
-                               mx = motion_Right;\r
+                       if(DIRECTIONIFELSEGFXTEST)\r
+                       {\r
+                               if(!inpu.Keyboard[def->left] && !inpu.Keyboard[def->right]){// &&               (inpu.Keyboard[def->up] || inpu.Keyboard[def->down])){\r
+//                                     if(testcontrolnoisy > 0){ printf("ud "); printf("%u ", inpu.Keyboard[def->up]); printf("%u ", inpu.Keyboard[def->down]);}\r
+                               if(inpu.Keyboard[def->up] && !inpu.Keyboard[def->down])// || player[pn].info.pdir == 0)\r
+                                       my = motion_Up;\r
+                               if(inpu.Keyboard[def->down] && !inpu.Keyboard[def->up])// || player[pn].info.pdir == 4)\r
+                                       my = motion_Down;\r
+                               }else if(!inpu.Keyboard[def->up] && !inpu.Keyboard[def->down]){// &&    (inpu.Keyboard[def->left] || inpu.Keyboard[def->right])){\r
+//                                     if(testcontrolnoisy > 0){ printf("lr "); printf("%u ", inpu.Keyboard[def->left]); printf("%u ", inpu.Keyboard[def->right]); }\r
+                               if(inpu.Keyboard[def->left] && !inpu.Keyboard[def->right])// || player[pn].info.pdir == 1)\r
+                                       mx = motion_Left;\r
+                               if(inpu.Keyboard[def->right] && !inpu.Keyboard[def->left])// || player[pn].info.pdir == 3)\r
+                                       mx = motion_Right;\r
+                               }\r
                        }\r
                        //input from player\r
                        if (inpu.Keyboard[def->button0])\r
@@ -900,22 +908,27 @@ register  KeyboardDef     *def;
                dy = my;// * 127;\r
        }\r
 \r
-       player[playnum].info.x = dx;\r
-       player[playnum].info.xaxis = mx;\r
-       player[playnum].info.y = dy;\r
-       player[playnum].info.yaxis = my;\r
-       player[playnum].info.button0 = buttons & (1 << 0);\r
-       player[playnum].info.button1 = buttons & (1 << 1);\r
-       player[playnum].info.button2 = buttons & (1 << 2);\r
-       player[playnum].info.button3 = buttons & (1 << 3);\r
-//     player[playnum].info.dir = DirTable[((my + 1) * 3) + (mx + 1)];\r
-       conpee=(((my + 1) * 2) + (mx + 1));\r
-       if(conpee) conpee--;\r
-       player[playnum].info.dir = DirTable[conpee];\r
-       if(player[playnum].q==1 && (mx!=motion_None || my!=motion_None))\r
+       player[pn].info.x = dx;\r
+       player[pn].info.xaxis = mx;\r
+       player[pn].info.y = dy;\r
+       player[pn].info.yaxis = my;\r
+       player[pn].info.button0 = buttons & (1 << 0);\r
+       player[pn].info.button1 = buttons & (1 << 1);\r
+       player[pn].info.button2 = buttons & (1 << 2);\r
+       player[pn].info.button3 = buttons & (1 << 3);\r
+//     player[pn].info.dir = DirTable[((my + 1) * 3) + (mx + 1)];\r
+       conpee=(((my + 1) * 2) + (mx + 1))-1; //if(conpee) conpee--;\r
+       player[pn].info.dir = DirTable[conpee];\r
+       if(DIRECTIONIFELSEGFXTEST && player[pn].d != player[pn].info.dir) player[pn].pdir=DirTable[conpee];\r
+       if(player[pn].q==1 && (mx!=motion_None || my!=motion_None))\r
        {\r
-               player[playnum].d = player[playnum].info.dir;\r
+               player[pn].d = player[pn].info.dir;\r
+               //printf("q =%d ", player[pn].q);\r
+               //if(testcontrolnoisy > 0)\r
+                       //if(testcontrolnoisy > 0)\r
+               //printf("cpee=%d ", conpee);\r
        }\r
+       if(testcontrolnoisy > 0)\r
 \r
 #if DEMO0\r
        if (DemoMode == demo_Record)\r
@@ -944,11 +957,13 @@ register  KeyboardDef     *def;
 #endif\r
 //#ifdef TESTCONTROLNOISY\r
 if(testcontrolnoisy > 0)\r
-if((inpu.Keyboard[def->up] || inpu.Keyboard[def->down] || inpu.Keyboard[def->left] || inpu.Keyboard[def->right])&& player[playnum].info.dir!=2)\r
+if((inpu.Keyboard[def->up] || inpu.Keyboard[def->down] || inpu.Keyboard[def->left] || inpu.Keyboard[def->right]) && NDIRECTIONIFELSEGFXTEST)\r
 {\r
+       printf("q=%d ", player[pn].q);\r
+       printf("cpee=%d ", conpee);\r
        printf("(mx)=%d ", mx);\r
        printf("(my)=%d ", my);\r
-       printf("dir=%d\n", player[playnum].info.dir);\r
+       printf("pdir=%d d=%d dir=%d\n", player[pn].pdir, player[pn].d, player[pn].info.dir);\r
 }\r
 //#endif\r
 }\r
@@ -960,10 +975,10 @@ if((inpu.Keyboard[def->up] || inpu.Keyboard[def->down] || inpu.Keyboard[def->lef
 //\r
 ///////////////////////////////////////////////////////////////////////////\r
 void\r
-IN_SetControlType(word playnum,player_t *player,ControlType type)\r
+IN_SetControlType(word pn,player_t *player,ControlType type)\r
 {\r
        // DEBUG - check that requested type is present?\r
-       player[playnum].Controls = type;\r
+       player[pn].Controls = type;\r
 }\r
 \r
 #if DEMO0\r