pdir

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

diff --git a/src/lib/16_in.c b/src/lib/16_in.c
index 062e3beef1dba3a4f18bd09bec4f8f5161de9da6..546d3dbdeba290f51e616c14baf8b779d6bf9673 100755 (executable)
--- a/src/lib/16_in.c
+++ b/src/lib/16_in.c
@@ -854,21 +854,18 @@ 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
-                       {\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
+                       if(!inpu.Keyboard[def->left] && !inpu.Keyboard[def->right]){\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].pdir == 0)\r
+                               my = motion_Up;\r
+                       if((inpu.Keyboard[def->down] && !inpu.Keyboard[def->up]) || player[pn].pdir == 4)\r
+                               my = motion_Down;\r
+                       }else if(!inpu.Keyboard[def->up] && !inpu.Keyboard[def->down]){\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].pdir == 1)\r
+                               mx = motion_Left;\r
+                       if((inpu.Keyboard[def->right] && !inpu.Keyboard[def->left]) || player[pn].pdir == 3)\r
+                               mx = motion_Right;\r
                        }\r
                        //input from player\r
                        if (inpu.Keyboard[def->button0])\r
@@ -919,16 +916,13 @@ register  KeyboardDef     *def;
 //     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
+\r
+       //TODO: overwriting direction must be added\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[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