\r
#include "src/lib/16_in.h"\r
\r
-byte testkeyin=0,testcontrolnoisy=0;\r
+byte testkeyin=0,testcontrolnoisy=0,testctrltype=0;\r
\r
/*\r
=============================================================================\r
{\r
boolean MousePresent;\r
boolean JoysPresent[MaxJoys];\r
- boolean JoyPadPresent[MaxPads];\r
+// boolean JoyPadPresent[MaxPads];\r
boolean Keyboard[NumCodes];\r
boolean Paused;\r
char LastASCII;\r
\r
KeyboardDef KbdDefs[MaxKbds];\r
JoystickDef JoyDefs[MaxJoys];\r
- JoypadDef JoypadDefs[MaxPads];\r
+// JoypadDef JoypadDefs[MaxPads];\r
} inpu;\r
\r
//extern inconfig inpu;\r
inpu.JoysPresent[i] = checkjoys? INL_StartJoy(i) : false;\r
\r
inst.IN_Started = true;\r
+\r
}\r
\r
///////////////////////////////////////////////////////////////////////////\r
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
+// || ((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
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
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
- //}else\r
- if(mx+my>1<mx+my && 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
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
buttons += 1 << 1;\r
realdelta = false;\r
break;\r
+// case ctrl_Joypad1:\r
+// case ctrl_Joypad2:\r
case ctrl_Joystick1:\r
case ctrl_Joystick2:\r
INL_GetJoyDelta(type - ctrl_Joystick,&dx,&dy,false);\r
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
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