\r
#include "src/lib/16_in.h"\r
\r
-byte testkeyin=0,testcontrolnoisy=0,gfxtest=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
Motion mx,my;\r
ControlType type;\r
sword conpee;\r
+ byte dir=DirTable[2];\r
register KeyboardDef *def;\r
\r
dx = dy = 0;\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_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!=-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
//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
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
#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("[%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
//#endif\r
}\r
projects / 16.git / blobdiff