\r
#include "src/lib/16_in.h"\r
\r
+static word far* clockw= (word far*) 0x046C; /* 18.2hz clock */\r
+\r
/*\r
=============================================================================\r
\r
*/\r
struct inconfig\r
{\r
- boolean MousePresent;\r
- boolean JoysPresent[MaxJoys];\r
- boolean JoyPadPresent[MaxPads];\r
+ boolean MousePresent;\r
+ boolean JoysPresent[MaxJoys];\r
boolean Keyboard[NumCodes];\r
boolean Paused;\r
char LastASCII;\r
\r
KeyboardDef KbdDefs[MaxKbds];\r
JoystickDef JoyDefs[MaxJoys];\r
- JoypadDef JoypadDefs[MaxPads];\r
} inpu;\r
\r
//extern inconfig inpu;\r
\r
static Direction DirTable[] = // Quick lookup for total direction\r
{\r
- //dir_Nortinest,
- dir_North,
+ //dir_Nortinest,\r
+ dir_North,\r
dir_West,\r
- dir_None, \r
- dir_East,
- dir_South
+ dir_None,\r
+ dir_East,\r
+ dir_South\r
//dir_NorthEast,\r
//dir_Soutinest,\r
//,dir_SouthEast\r
#endif\r
\r
// Internal routines\r
+\r
///////////////////////////////////////////////////////////////////////////\r
//\r
// INL_KeyService() - Handles a keyboard interrupt (key up/down)\r
\r
if (INL_KeyHook && !special)\r
INL_KeyHook();\r
- #ifdef TESTKEYIN\r
- printf("%c %x %u\n", c, 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
void\r
Mouse(int x)\r
{\r
- union REGS CPURegs;\r
- x = CPURegs.x.ax;\r
- int86(MouseInt,&CPURegs,&CPURegs);\r
+ //union REGS CPURegs;\r
+ //x = CPURegs.x.ax;\r
+ __asm {\r
+ mov ax,x\r
+ int MouseInt\r
+ }\r
+ //int86(MouseInt,&CPURegs,&CPURegs);\r
}\r
\r
///////////////////////////////////////////////////////////////////////////\r
yb = 1 << ys;\r
\r
// Read the absolute joystick values\r
- __asm\r
- {\r
+ __asm {\r
pushf // Save some registers\r
push si\r
push di\r
\r
push bp // Don't mess up stack frame\r
mov bp,MaxJoyValue\r
-\r
+#ifdef __BORLANDC__\r
+ }\r
+#endif\r
loo:\r
+#ifdef __BORLANDC__\r
+ __asm {\r
+#endif\r
in al,dx // Get bits indicating whether all are finished\r
\r
dec bp // Check bounding register\r
\r
add cl,bl\r
jnz loo // If both bits were 0, drop out\r
-\r
+#ifdef __BORLANDC__\r
+ }\r
+#endif\r
done:\r
+#ifdef __BORLANDC__\r
+ __asm {\r
+#endif\r
pop bp\r
\r
mov cl,[xs] // Get the number of bits to shift\r
INL_GetJoyDelta(word joy,int *dx,int *dy,boolean adaptive)\r
{\r
word x,y;\r
- dword time;\r
- dword TimeCount = *clockdw;\r
+ word time;\r
+ word TimeCount = *clockw;\r
JoystickDef *def;\r
-static dword lasttime;\r
+static word lasttime;\r
\r
IN_GetJoyAbs(joy,&x,&y);\r
def = inpu.JoyDefs + joy;\r
word\r
IN_GetJoyButtonsDB(word joy)\r
{\r
- dword TimeCount = *clockdw;\r
- dword lasttime;\r
+ word TimeCount = *clockw;\r
+ word lasttime;\r
word result1,result2;\r
\r
do\r
\r
checkjoys = true;\r
checkmouse = true;\r
- for (i = 1;i < __argc;i++)\r
+ for (i = 1;i < _argc;i++)\r
{\r
- switch (US_CheckParm(__argv[i],ParmStringsIN))\r
+ switch (US_CheckParm(_argv[i],ParmStringsIN))\r
{\r
case 0:\r
checkjoys = false;\r
inpu.JoysPresent[i] = checkjoys? INL_StartJoy(i) : false;\r
\r
inst.IN_Started = true;\r
+\r
}\r
\r
///////////////////////////////////////////////////////////////////////////\r
void\r
IN_Default(boolean gotit,player_t *player,ControlType nt)\r
{\r
+ int i;\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
inpu.KbdDefs[0].down = 0x50;\r
//in.KbdDefs[0].downright = 0x51;\r
IN_SetControlType(0,player,nt);\r
+ for(i=0; i>MaxPlayers;i++)\r
+ player[i].d=2;\r
}\r
\r
///////////////////////////////////////////////////////////////////////////\r
void\r
IN_ClearKeysDown()\r
{\r
- int i;\r
+ //int i;\r
\r
inpu.LastScan = sc_None;\r
inpu.LastASCII = key_None;\r
// player and fills in the control info struct\r
//\r
///////////////////////////////////////////////////////////////////////////\r
-void\r
-IN_ReadControl(int playnum,player_t *player)\r
+void near\r
+IN_ReadControl(int pn,player_t *player)\r
{\r
boolean realdelta;\r
+#if DEMO0\r
byte dbyte;\r
+#endif\r
word buttons;\r
int dx,dy;\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
realdelta = false;\r
}\r
else if (DemoMode == demo_PlayDone)\r
- Quit("Demo playback exceeded");\r
+ Quit ("Demo playback exceeded");\r
else\r
{\r
#endif\r
- switch (type = player[playnum].Controls)\r
+ switch (type = player[pn].Controls)\r
{\r
case ctrl_Keyboard1:\r
case ctrl_Keyboard2:\r
mx = motion_Left,my = motion_Down;\r
else if (Keyboard[def->downright])\r
mx = motion_Right,my = motion_Down;*/\r
-\r
- //if(!inpu.Keyboard[def->left] && !inpu.Keyboard[def->right]){
- \r
- if((inpu.Keyboard[def->up] && player[playnum].info.dir == 2))// || player[playnum].info.dir == 0)\r
- my = motion_Up;\r
- else if((inpu.Keyboard[def->down] && player[playnum].info.dir == 2))// || player[playnum].info.dir == 4)\r
- my = motion_Down;\r
-\r
- //}else if(!inpu.Keyboard[def->up] && !inpu.Keyboard[def->down]){\r
- if((inpu.Keyboard[def->left] && player[playnum].info.dir == 2))// || player[playnum].info.dir == 1)\r
- mx = motion_Left;\r
- else if((inpu.Keyboard[def->right] && player[playnum].info.dir == 2))// || player[playnum].info.dir == 3)\r
- mx = motion_Right;\r
- //}\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
+ 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]))\r
+ mx = motion_Right;\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]; }//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]; }//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
+#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
buttons += 1 << 0;\r
if (inpu.Keyboard[def->button1])\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
}\r
else\r
{\r
- dx = mx * 127;\r
- dy = my * 127;\r
+ dx = mx;// * 127;\r
+ dy = my;// * 127;\r
}\r
\r
- player[playnum].info.x = dx;\r
- player[playnum].info.xaxis = mx;\r
- player[playnum].info.y = dy;\r
- player[playnum].info.yaxis = my;\r
- player[playnum].info.button0 = buttons & (1 << 0);\r
- player[playnum].info.button1 = buttons & (1 << 1);\r
- player[playnum].info.button2 = buttons & (1 << 2);\r
- player[playnum].info.button3 = buttons & (1 << 3);\r
-// player[playnum].info.dir = DirTable[((my + 1) * 3) + (mx + 1)];
- player[playnum].info.dir = DirTable[(((my + 1) * 2) + (mx + 1))-1];\r
+ player[pn].info.x = dx;\r
+ player[pn].info.xaxis = mx;\r
+ player[pn].info.y = dy;\r
+ player[pn].info.yaxis = my;\r
+ player[pn].info.button0 = buttons & (1 << 0);\r
+ player[pn].info.button1 = buttons & (1 << 1);\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;\r
+ player[pn].info.dir = DirTable[conpee];\r
+\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
+ if(dir==2) player[pn].d = player[pn].info.dir;\r
+ else player[pn].d = DirTable[dir];\r
+ }\r
\r
#if DEMO0\r
if (DemoMode == demo_Record)\r
DemoOffset += 2;\r
\r
if (DemoOffset >= DemoSize)\r
- Quit("Demo buffer overflow");\r
+ Quit ("Demo buffer overflow");\r
\r
DemoBuffer[DemoOffset] = 1;\r
DemoBuffer[DemoOffset + 1] = dbyte;\r
}\r
}\r
#endif\r
-#ifdef TESTCONTROLNOISY
-if(inpu.Keyboard[def->up] || inpu.Keyboard[def->down] || inpu.Keyboard[def->left] || inpu.Keyboard[def->right])
-{
- printf("(mx)=%d ", mx);
- printf("(my)=%d ", my);
- printf("dir=%d\n", player[playnum].info.dir);
+#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("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
+ /*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
}\r
//\r
///////////////////////////////////////////////////////////////////////////\r
void\r
-IN_SetControlType(word playnum,player_t *player,ControlType type)\r
+IN_SetControlType(word pn,player_t *player,ControlType type)\r
{\r
// DEBUG - check that requested type is present?\r
- player[playnum].Controls = type;\r
+ player[pn].Controls = type;\r
}\r
\r
#if DEMO0\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
boolean\r
IN_UserInput(dword delay,boolean clear)\r
{\r
- dword TimeCount = *clockdw;\r
- dword lasttime;\r
+ word TimeCount = *clockw;\r
+ word lasttime;\r
\r
lasttime = TimeCount;\r
do\r
\r
boolean IN_qb(byte kee)\r
{\r
- printf("%u\n", inpu.Keyboard[kee]);\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
OSDN Git Service
