16_in todo slightly updated thinking about making jpoystick input verbose

diff --git a/src/lib/16_ca.c b/src/lib/16_ca.c
index e1555f2f4566e11090f186df3242573f09ef3e1d..7eb30d8763baf8254a65f84514baeeb0bdbed3f1 100755 (executable)
--- a/src/lib/16_ca.c
+++ b/src/lib/16_ca.c
@@ -235,7 +235,7 @@ boolean CA_FarRead(int handle, byte huge *dest, dword length, mminfo_t *mm)
                //fat=segm*0xfffflu;\r
                //length-=fat;\r
 //             printf("CA_FarRead doesn't support 64K reads yet!\n");\r
-               return 0;//todo: EXPAND!!!\r
+               return 0;//TODO: EXPAND!!!\r
        }\r
 \r
        //if(!fat&&!segm)\r

diff --git a/src/lib/16_in.c b/src/lib/16_in.c
index 3c16d32a24f8f4db202d9f884631c9be56155250..aa3f30eea93b541be7408e12b9b7d0eeb875c297 100755 (executable)
--- a/src/lib/16_in.c
+++ b/src/lib/16_in.c
@@ -380,39 +380,8 @@ static     word    lasttime;
 \r
        //TODO: inject p16 input controls!\r
        //which is this\r
-       /*                      if(DIRECTIONIFELSE)\r
-                       {\r
-                       if(!inpu.Keyboard[def->left] && !inpu.Keyboard[def->right]){\r
-                               if((inpu.Keyboard[def->up] && !inpu.Keyboard[def->down]))\r
-                                       my = motion_Up;\r
-                               if((inpu.Keyboard[def->down] && !inpu.Keyboard[def->up]))\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]))\r
-                                       mx = motion_Left;\r
-                               if((inpu.Keyboard[def->right] && !inpu.Keyboard[def->left]))// || player[pn].pdir != 1)\r
-                                       mx = motion_Right;\r
-                       }else\r
-                               //if(mx+my!=1 && mx+my!=-1 && mx!=my!=0)\r
-                               {       //2 keys pressed\r
-                                       switch (player[pn].pdir)\r
-                                       {\r
-                                               case 0:\r
-                                               case 4:\r
-                                                       if((inpu.Keyboard[def->left] && !inpu.Keyboard[def->right])) dir = DirTable[1];\r
-                                                       else if((inpu.Keyboard[def->right] && !inpu.Keyboard[def->left])) dir = DirTable[3];\r
-                                               break;\r
-                                               case 1:\r
-                                               case 3:\r
-                                                       if((inpu.Keyboard[def->up] && !inpu.Keyboard[def->down])) dir = DirTable[0];\r
-                                                       else if((inpu.Keyboard[def->down] && !inpu.Keyboard[def->up])) dir = DirTable[4];\r
-                                               break;\r
-                                               default:\r
-                                               break;\r
-                                       }\r
-                                       if(testcontrolnoisy > 0){ printf("dir=%c ", dirchar(dir)); printf("pdir=%c      ", dirchar(player[pn].pdir)); }\r
-                               }//else printf("                                ");\r
-                       }*/\r
+       //into joystick code!\r
+       //look at IN_ReadControl\r
        if (x < def->threshMinX)\r
        {\r
                if (x < def->joyMinX)\r
@@ -889,7 +858,7 @@ register    KeyboardDef     *def;
                                mx = motion_Left,my = motion_Down;\r
                        else if (Keyboard[def->downright])\r
                                mx = motion_Right,my = motion_Down;*/\r
-                       if(DIRECTIONIFELSE)\r
+                       if(DIRECTIONIFELSE)//(player[pn].info.dir == 2)\r
                        {\r
                        if(!inpu.Keyboard[def->left] && !inpu.Keyboard[def->right]){\r
                                if((inpu.Keyboard[def->up] && !inpu.Keyboard[def->down]))\r