tesuto.exe is drawvrl4 ^^

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

diff --git a/src/lib/16_in.c b/src/lib/16_in.c
index 4e32173bf7625674248da469551168054e0948b6..801759ad4757d3fceec5db029144c655b1d42147 100755 (executable)
--- a/src/lib/16_in.c
+++ b/src/lib/16_in.c
@@ -855,46 +855,38 @@ register  KeyboardDef     *def;
                                mx = motion_Left,my = motion_Down;\r
                        else if (Keyboard[def->downright])\r
                                mx = motion_Right,my = motion_Down;*/\r
-                       if(DIRECTIONIFELSEGFXTEST)\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
-                               {\r
                                        my = motion_Up;\r
-                               }\r
                                if((inpu.Keyboard[def->down] && !inpu.Keyboard[def->up]))\r
-                               {\r
                                        my = motion_Down;\r
-                               }\r
                        }else if(!inpu.Keyboard[def->up] && !inpu.Keyboard[def->down]){\r
                                if((inpu.Keyboard[def->left] && !inpu.Keyboard[def->right]))\r
-                               {\r
                                        mx = motion_Left;\r
-                               }\r
                                if((inpu.Keyboard[def->right] && !inpu.Keyboard[def->left]))// || player[pn].pdir != 1)\r
-                               {\r
                                        mx = motion_Right;\r
-                               }\r
-                       }else{  //2 keys pressed\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
-                                                       if(testcontrolnoisy > 0) printf("dir=%c ", dirchar(dir));\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
-                                                       if(testcontrolnoisy > 0) printf("dir=%c ", dirchar(dir));\r
                                                break;\r
                                                default:\r
                                                break;\r
                                        }\r
-                                       if(testcontrolnoisy > 0) printf("pdir=%c        ", dirchar(player[pn].pdir));\r
-                               }\r
+                                       if(testcontrolnoisy > 0){ printf("dir=%c ", dirchar(dir)); printf("pdir=%c      ", dirchar(player[pn].pdir)); }\r
+                               }//else printf("                                ");\r
                        }\r
                        //input from player\r
                        if (inpu.Keyboard[def->button0])\r
@@ -987,6 +979,7 @@ if((inpu.Keyboard[def->up] || inpu.Keyboard[def->down] || inpu.Keyboard[def->lef
        printf("cpee=%c ", dirchar(conpee));\r
        //printf("(mx)=%d       ", mx);\r
        //printf("(my)=%d       ", my);\r
+       //printf("[%d]  ", mx+my);\r
        printf("pdir=%c d=%c dir=%c ", dirchar(player[pn].pdir), dirchar(player[pn].d), dirchar(player[pn].info.dir));\r
        printf("%c%d %c%d %c%d %c%d\n", dirchar(0), inpu.Keyboard[def->up], dirchar(4), inpu.Keyboard[def->down], dirchar(1), inpu.Keyboard[def->left], dirchar(3), inpu.Keyboard[def->right]);\r
 }\r