\r
#include "src/lib/16_in.h"\r
\r
-boolean testkeyin=0,testcontrolnoisy=0,testctrltype=0;\r
+#ifdef __DEBUG_InputMgr__\r
+boolean dbg_testkeyin=0,dbg_testcontrolnoisy=0;\r
+#endif\r
\r
/*\r
=============================================================================\r
\r
if (INL_KeyHook && !special)\r
INL_KeyHook();\r
-//#ifdef TESTKEYIN\r
- if(testkeyin > 0) printf("%c %u [0x%x %u] %u\n", c, c, k, k, inpu.Keyboard[k]);\r
-//endif\r
+#ifdef __DEBUG_InputMgr__\r
+ if(dbg_testkeyin > 0) printf("%c %u [0x%x %u] %u\n", c, c, k, k, inpu.Keyboard[k]);\r
+#endif\r
outp(0x20,0x20);\r
}\r
\r
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
IN_Default(boolean gotit,player_t *player,ControlType nt)\r
{\r
int i;\r
- if(testctrltype==0)\r
if\r
(\r
(!gotit)\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(DIRECTIONIFELSE)\r
+//TODO: make this into a function that the joystick AND keyboard can use wwww\r
+ if(DIRECTIONIFELSE)//(player[pn].info.dir == 2)\r
{\r
if(!inpu.Keyboard[def->left] && !inpu.Keyboard[def->right]){\r
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
+ if((inpu.Keyboard[def->right] && !inpu.Keyboard[def->left]))\r
mx = motion_Right;\r
- }else\r
- //if(mx+my!=1 && mx+my!=-1 && mx!=my!=0)\r
- { //2 keys pressed\r
+ }else{ //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
+ if((inpu.Keyboard[def->left] && !inpu.Keyboard[def->right])){ dir = DirTable[1]; }//mx = motion_Left; }\r
+ else if((inpu.Keyboard[def->right] && !inpu.Keyboard[def->left])){ dir = DirTable[3]; }//mx = motion_Right; }\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
+ if((inpu.Keyboard[def->up] && !inpu.Keyboard[def->down])){ dir = DirTable[0]; }//my = motion_Up; }\r
+ else if((inpu.Keyboard[def->down] && !inpu.Keyboard[def->up])){ dir = DirTable[4]; }//my = motion_Down; }\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
+#ifdef __DEBUG_InputMgr__\r
+ //if(dbg_testcontrolnoisy > 0){ printf("dir=%c ", dirchar(dir)); printf("pdir=%c ", dirchar(player[pn].pdir)); }\r
+#endif\r
+ }\r
}\r
//input from player\r
if (inpu.Keyboard[def->button0])\r
}\r
}\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]) || player[pn].q>1)\r
+#ifdef __DEBUG_InputMgr__\r
+if(dbg_testcontrolnoisy > 0)\r
+if(player[pn].info.dir!=2/*(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=%c ", dirchar(conpee));\r
- //printf("(mx)=%d ", mx);\r
- //printf("(my)=%d ", my);\r
- //printf("[%d] ", mx+my);\r
+ //printf("b1=%u b2=%u b3=%u b4=%u ", player[pn].info.button0, player[pn].info.button1, player[pn].info.button2, player[pn].info.button3);\r
+ //printf("q=%d ", player[pn].q);\r
+ //printf("cpee=%c ", dirchar(conpee));\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
+ /*if(realdelta) */printf("dx=%d dy=%d mx=%d my=%d", player[pn].info.x, player[pn].info.y, player[pn].info.xaxis, player[pn].info.yaxis);\r
+ //else if(!realdelta) printf("%c%d %c%d %c%d %c%d", 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
+ printf("\n");\r
}\r
-//#endif\r
+#endif\r
}\r
\r
///////////////////////////////////////////////////////////////////////////\r
{\r
word i;\r
\r
+ if (!inst.IN_Started)\r
+ return;\r
+\r
IN_ClearKey(inpu.LastScan);\r
inpu.LastScan = sc_None;\r
\r
\r
boolean IN_qb(byte kee)\r
{\r
-//#ifdef TESTKEYIN\r
-// if(testkeyin > 0) printf("%u\n", inpu.Keyboard[kee]);\r
-//#endif\r
+#ifdef __DEBUG_InputMgr__\r
+// if(dbg_testkeyin > 0) printf("%u\n", inpu.Keyboard[kee]);\r
+#endif\r
if(inpu.Keyboard[kee]==true) return 1;\r
else return 0;\r
}\r
+\r
+//init player!\r
+void IN_initplayer(player_t *player, word pn)\r
+{\r
+ player[pn].x = player[pn].tx*TILEWH;\r
+ player[pn].y = player[pn].ty*TILEWH;\r
+ player[pn].triggerx = player[pn].tx;\r
+ player[pn].triggery = player[pn].ty+1;\r
+/* player[0].info.x = player[0].tx;\r
+ player[0].info.xaxis = player[0].tx*TILEWH;\r
+ player[0].info.y = player[0].ty;\r
+ player[0].info.yaxis = player[0].ty*TILEWH;*/\r
+ player[pn].q=1;\r
+ player[pn].d=2;\r
+ player[pn].hp=4;\r
+ player[pn].speed=4;\r
+ player[pn].persist_aniframe=0;\r
+ player[pn].spt=(TILEWH/(player[pn].speed)); //speed per tile wwww\r
+}\r