Motion mx,my;\r
ControlType type;\r
sword conpee;\r
+ byte dir=DirTable[2];\r
register KeyboardDef *def;\r
\r
dx = dy = 0;\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]){\r
+ if(!inpu.Keyboard[def->left] && !inpu.Keyboard[def->right]){\r
if((inpu.Keyboard[def->up] && !inpu.Keyboard[def->down]))\r
- {\r
my = motion_Up;\r
- }\r
if((inpu.Keyboard[def->down] && !inpu.Keyboard[def->up]))\r
- {\r
my = motion_Down;\r
- }\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
- {\r
mx = motion_Left;\r
- }\r
if((inpu.Keyboard[def->right] && !inpu.Keyboard[def->left]))// || player[pn].pdir != 1)\r
- {\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
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
\r
//TODO: overwriting direction must be added\r
if(DirTable[conpee]!=2) player[pn].pdir=DirTable[conpee];\r
- if(player[pn].q==1 && (mx!=motion_None || my!=motion_None))\r
+ if(player[pn].q==1 &&( dir!=2 || (mx!=motion_None || my!=motion_None)))\r
{\r
- player[pn].d = player[pn].info.dir;\r
+ if(dir==2) player[pn].d = player[pn].info.dir;\r
+ else player[pn].d = DirTable[dir];\r
}\r
\r
#if DEMO0\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