reverted it back to valley's version www

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

diff --git a/src/lib/16_in.c b/src/lib/16_in.c
old mode 100644 (file)
new mode 100755 (executable)
index 4dd9aa0..f07a694
--- a/src/lib/16_in.c
+++ b/src/lib/16_in.c
@@ -371,7 +371,7 @@ INL_GetJoyDelta(word joy,int *dx,int *dy,boolean adaptive)
 {\r
        word            x,y;\r
        dword   time;\r
-       dword TimeCount = /***/clockdw;\r
+       dword TimeCount = *clockdw;\r
        JoystickDef     *def;\r
 static dword   lasttime;\r
 \r
@@ -465,7 +465,7 @@ register    word    result;
 word\r
 IN_GetJoyButtonsDB(word joy)\r
 {\r
-       dword TimeCount = /***/clockdw;\r
+       dword TimeCount = *clockdw;\r
        dword   lasttime;\r
        word            result1,result2;\r
 \r
@@ -799,18 +799,19 @@ IN_ReadCursor(CursorInfo *info)
 ///////////////////////////////////////////////////////////////////////////\r
 void\r
 IN_ReadControl(int playnum,player_t *player)\r
-{\r
+{
                        boolean         realdelta;\r
                        byte            dbyte;\r
                        word            buttons;\r
                        int                     dx,dy;\r
                        Motion          mx,my;\r
-                       ControlType     type;\r
+                       ControlType     type;
+                       sword conpee;\r
 register       KeyboardDef     *def;\r
 \r
        dx = dy = 0;\r
        mx = my = motion_None;\r
-       buttons = 0;\r
+       buttons = 0;
 \r
 #if DEMO0\r
        if (DemoMode == demo_Playback)\r
@@ -848,20 +849,17 @@ register  KeyboardDef     *def;
                                mx = motion_Left,my = motion_Down;\r
                        else if (Keyboard[def->downright])\r
                                mx = motion_Right,my = motion_Down;*/\r
-\r
-                       //if(!inpu.Keyboard[def->left] && !inpu.Keyboard[def->right]){
-                       \r
-                       if((inpu.Keyboard[def->up] && player[playnum].info.dir == 2))// || player[playnum].info.dir == 0)\r
-                               my = motion_Up;\r
-                       else if((inpu.Keyboard[def->down] && player[playnum].info.dir == 2))// || player[playnum].info.dir == 4)\r
-                               my = motion_Down;\r
-\r
-                       //}else if(!inpu.Keyboard[def->up] && !inpu.Keyboard[def->down]){\r
-                       if((inpu.Keyboard[def->left] && player[playnum].info.dir == 2))// || player[playnum].info.dir == 1)\r
-                               mx = motion_Left;\r
-                       else if((inpu.Keyboard[def->right] && player[playnum].info.dir == 2))// || player[playnum].info.dir == 3)\r
-                               mx = motion_Right;\r
-                       //}\r
+                       if(!inpu.Keyboard[def->left] && !inpu.Keyboard[def->right]){
+                       if((inpu.Keyboard[def->up] && !inpu.Keyboard[def->down] && player[playnum].d == 2))// || player[playnum].info.dir == 0)\r
+                               my = motion_Up;
+                       if((inpu.Keyboard[def->down] && !inpu.Keyboard[def->up] && player[playnum].d == 2))// || player[playnum].info.dir == 4)\r
+                               my = motion_Down;
+                       }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;
+                       if((inpu.Keyboard[def->right] && !inpu.Keyboard[def->left] && player[playnum].d == 2))// || player[playnum].info.dir == 3)\r
+                               mx = motion_Right;
+                       }\r
                        if (inpu.Keyboard[def->button0])\r
                                buttons += 1 << 0;\r
                        if (inpu.Keyboard[def->button1])\r
@@ -895,10 +893,10 @@ register  KeyboardDef     *def;
        }\r
        else\r
        {\r
-               dx = mx * 127;\r
-               dy = my * 127;\r
+               dx = mx;// * 127;\r
+               dy = my;// * 127;\r
        }\r
-\r
+
        player[playnum].info.x = dx;\r
        player[playnum].info.xaxis = mx;\r
        player[playnum].info.y = dy;\r
@@ -908,7 +906,13 @@ register   KeyboardDef     *def;
        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)];
-       player[playnum].info.dir = DirTable[(((my + 1) * 2) + (mx + 1))-1];\r
+       conpee=(((my + 1) * 2) + (mx + 1));
+       if(conpee) conpee--;
+       player[playnum].info.dir = DirTable[conpee];
+       if(player[playnum].q==1 && (mx!=motion_None || my!=motion_None))
+       {
+               player[playnum].d = player[playnum].info.dir;
+       }
 \r
 #if DEMO0\r
        if (DemoMode == demo_Record)\r
@@ -936,7 +940,7 @@ register    KeyboardDef     *def;
        }\r
 #endif\r
 #ifdef TESTCONTROLNOISY
-if(inpu.Keyboard[def->up] || inpu.Keyboard[def->down] || inpu.Keyboard[def->left] || inpu.Keyboard[def->right])
+if((inpu.Keyboard[def->up] || inpu.Keyboard[def->down] || inpu.Keyboard[def->left] || inpu.Keyboard[def->right])&& player[playnum].info.dir!=2)
 {
        printf("(mx)=%d ", mx);
        printf("(my)=%d ", my);
@@ -1176,7 +1180,7 @@ IN_IsUserInput()
 boolean\r
 IN_UserInput(dword delay,boolean clear)\r
 {\r
-       dword TimeCount = /***/clockdw;\r
+       dword TimeCount = *clockdw;\r
        dword   lasttime;\r
 \r
        lasttime = TimeCount;\r
@@ -1205,8 +1209,10 @@ void IN_ClearKey(byte code)
        }\r
 \r
 boolean IN_qb(byte kee)\r
-{\r
-       printf("%u\n", inpu.Keyboard[kee]);\r
+{
+       #ifdef TESTKEYIN\r
+       printf("%u\n", inpu.Keyboard[kee]);
+       #endif\r
        if(inpu.Keyboard[kee]==true) return 1;\r
        else return 0;\r
 }\r