updated copyright www

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

diff --git a/src/lib/16_in.c b/src/lib/16_in.c
index 062e3beef1dba3a4f18bd09bec4f8f5161de9da6..7f467cce073ab6425d015ca18446d59700bcb24c 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
-byte testkeyin=0,testcontrolnoisy=0,gfxtest=0;\r
+byte testkeyin=0,testcontrolnoisy=0;\r
 \r
 /*\r
 =============================================================================\r
@@ -812,6 +812,7 @@ IN_ReadControl(int pn,player_t *player)
                        Motion          mx,my;\r
                        ControlType     type;\r
                        sword conpee;\r
+                       byte dir=DirTable[2];\r
 register       KeyboardDef     *def;\r
 \r
        dx = dy = 0;\r
@@ -854,20 +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]){// &&               (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
+                       //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])// || player[pn].info.pdir == 4)\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]){// &&    (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
+                       //}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].info.pdir == 3)\r
+                               if((inpu.Keyboard[def->right] && !inpu.Keyboard[def->left]))// || player[pn].pdir != 1)\r
                                        mx = motion_Right;\r
+\r
+                       //}else\r
+                               if(mx+my>1<mx+my)\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
                                }\r
                        }\r
                        //input from player\r
@@ -917,18 +936,16 @@ register  KeyboardDef     *def;
        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
+       conpee=(((my + 1) * 2) + (mx + 1))-1;\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
+       //TODO: overwriting direction must be added\r
+       if(DirTable[conpee]!=2) player[pn].pdir=DirTable[conpee];\r
+       if(player[pn].q==1 &&( dir!=2 || (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
+               if(dir==2) player[pn].d = player[pn].info.dir;\r
+               else player[pn].d = DirTable[dir];\r
        }\r
-       if(testcontrolnoisy > 0)\r
 \r
 #if DEMO0\r
        if (DemoMode == demo_Record)\r
@@ -957,13 +974,14 @@ 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]) && NDIRECTIONIFELSEGFXTEST)\r
+if((inpu.Keyboard[def->up] || inpu.Keyboard[def->down] || inpu.Keyboard[def->left] || inpu.Keyboard[def->right]) || player[pn].q>1)\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("pdir=%d d=%d dir=%d\n", player[pn].pdir, player[pn].d, player[pn].info.dir);\r
+       printf("cpee=%c ", dirchar(conpee));\r
+       //printf("(mx)=%d       ", mx);\r
+       //printf("(my)=%d       ", 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
 //#endif\r
 }\r