Merge remote-tracking branch 'upstream/master'

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

diff --git a/src/lib/16_in.c b/src/lib/16_in.c
index 1ae5552e117b3d4dd5d17771d8e46e2b7af689ae..66c98dd6936b55fa262243f7951c830bf3b5db67 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;\r
+boolean testkeyin=0,testcontrolnoisy=0,testctrltype=0;\r
 \r
 /*\r
 =============================================================================\r
@@ -51,7 +51,6 @@ struct inconfig
 {\r
        boolean                 MousePresent;\r
        boolean                 JoysPresent[MaxJoys];\r
-       boolean                 JoyPadPresent[MaxPads];\r
        boolean         Keyboard[NumCodes];\r
        boolean         Paused;\r
        char            LastASCII;\r
@@ -59,7 +58,6 @@ struct inconfig
 \r
        KeyboardDef     KbdDefs[MaxKbds];\r
        JoystickDef     JoyDefs[MaxJoys];\r
-       JoypadDef       JoypadDefs[MaxPads];\r
 } inpu;\r
 \r
 //extern inconfig inpu;\r
@@ -380,6 +378,41 @@ static     word    lasttime;
        IN_GetJoyAbs(joy,&x,&y);\r
        def = inpu.JoyDefs + joy;\r
 \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
        if (x < def->threshMinX)\r
        {\r
                if (x < def->joyMinX)\r
@@ -659,6 +692,7 @@ IN_Startup()
                inpu.JoysPresent[i] = checkjoys? INL_StartJoy(i) : false;\r
 \r
        inst.IN_Started = true;\r
+\r
 }\r
 \r
 ///////////////////////////////////////////////////////////////////////////\r
@@ -670,14 +704,13 @@ void
 IN_Default(boolean gotit,player_t *player,ControlType nt)\r
 {\r
        int i;\r
+       if(testctrltype==0)\r
        if\r
        (\r
                (!gotit)\r
        ||      ((nt == ctrl_Joystick1) && !inpu.JoysPresent[0])\r
        ||      ((nt == ctrl_Joystick2) && !inpu.JoysPresent[1])\r
        ||      ((nt == ctrl_Mouse) && !inpu.MousePresent)\r
-       ||      ((nt == ctrl_Joypad1) && !inpu.JoyPadPresent[0])\r
-       ||      ((nt == ctrl_Joypad2) && !inpu.JoyPadPresent[1])\r
        )\r
                nt = ctrl_Keyboard1;\r
        inpu.KbdDefs[0].button0 = 0x1c;\r
@@ -841,6 +874,7 @@ register    KeyboardDef     *def;
        else\r
        {\r
 #endif\r
+               if(testctrltype>0) printf("player[pn].Controls=%c\n", player[pn].Controls);\r
                switch (type = player[pn].Controls)\r
                {\r
                case ctrl_Keyboard1:\r
@@ -857,19 +891,18 @@ register  KeyboardDef     *def;
                                mx = motion_Right,my = motion_Down;*/\r
                        if(DIRECTIONIFELSE)\r
                        {\r
-                       //if(!inpu.Keyboard[def->left] && !inpu.Keyboard[def->right]){\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
+                       }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
-\r
-                       //}else\r
-                               if(mx+my>1<mx+my)\r
+                       }else\r
+                               //if(mx+my!=1 && mx+my!=-1 && mx!=my!=0)\r
                                {       //2 keys pressed\r
                                        switch (player[pn].pdir)\r
                                        {\r
@@ -887,7 +920,7 @@ register    KeyboardDef     *def;
                                                break;\r
                                        }\r
                                        if(testcontrolnoisy > 0){ printf("dir=%c ", dirchar(dir)); printf("pdir=%c      ", dirchar(player[pn].pdir)); }\r
-                               //}\r
+                               }//else printf("                                ");\r
                        }\r
                        //input from player\r
                        if (inpu.Keyboard[def->button0])\r
@@ -907,10 +940,6 @@ register   KeyboardDef     *def;
                        buttons = INL_GetMouseButtons();\r
                        realdelta = true;\r
                        break;\r
-               case ctrl_Joypad1:\r
-               case ctrl_Joypad2:\r
-                       printf("wwww");\r
-                       break;\r
                }\r
 #ifdef DEMO0\r
        }\r
@@ -939,7 +968,6 @@ register    KeyboardDef     *def;
        conpee=(((my + 1) * 2) + (mx + 1))-1;\r
        player[pn].info.dir = DirTable[conpee];\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
@@ -980,6 +1008,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