-/* Catacomb Apocalypse Source Code\r
- * Copyright (C) 1993-2014 Flat Rock Software\r
- *\r
- * This program is free software; you can redistribute it and/or modify\r
- * it under the terms of the GNU General Public License as published by\r
- * the Free Software Foundation; either version 2 of the License, or\r
- * (at your option) any later version.\r
- *\r
- * This program is distributed in the hope that it will be useful,\r
- * but WITHOUT ANY WARRANTY; without even the implied warranty of\r
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the\r
- * GNU General Public License for more details.\r
- *\r
- * You should have received a copy of the GNU General Public License along\r
- * with this program; if not, write to the Free Software Foundation, Inc.,\r
- * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.\r
- */\r
-\r
//\r
// ID Engine\r
// ID_IN.c - Input Manager\r
ScanCode CurCode,LastCode;\r
} inst;\r
\r
-static void (*INL_KeyHook)(void);\r
-static void interrupt (*OldKeyVect)(void);\r
-static char *ParmStringsIN[] = {"nojoys","nomouse",nil};\r
-\r
static byte far ASCIINames[] = // Unshifted ASCII for scan codes\r
{\r
// 0 1 2 3 4 5 6 7 8 9 A B C D E F\r
}\r
#endif\r
\r
+static void (*INL_KeyHook)(void);\r
+static void interrupt (*OldKeyVect)(void);\r
+static char *ParmStringsIN[] = {"nojoys","nomouse",nil};\r
+\r
// Internal routines\r
\r
///////////////////////////////////////////////////////////////////////////\r
// INL_KeyService() - Handles a keyboard interrupt (key up/down)\r
//\r
///////////////////////////////////////////////////////////////////////////\r
-void interrupt\r
-INL_KeyService()\r
+/*static */void interrupt\r
+INL_KeyService(void)\r
{\r
static boolean special;\r
byte k,c,\r
temp;\r
\r
- k = inp(0x60); // Get the scan code\r
+ k = inportb(0x60); // Get the scan code\r
\r
// Tell the XT keyboard controller to clear the key\r
- outp(0x61,(temp = inp(0x61)) | 0x80);\r
- outp(0x61,temp);\r
+ outportb(0x61,(temp = inportb(0x61)) | 0x80);\r
+ outportb(0x61,temp);\r
\r
if (k == 0xe0) // Special key prefix\r
special = true;\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
+ outportb(0x20,0x20);\r
}\r
\r
-void\r
-Mouse(int x)\r
+void INL_Mouse(int x)\r
{\r
//union REGS CPURegs;\r
//x = CPURegs.x.ax;\r
///////////////////////////////////////////////////////////////////////////\r
//\r
// INL_GetJoyDelta() - Returns the relative movement of the specified\r
-// joystick (from +/-127, scaled adaptively)\r
+// joystick (from +/-127)\r
//\r
///////////////////////////////////////////////////////////////////////////\r
-static void\r
-INL_GetJoyDelta(word joy,int *dx,int *dy,boolean adaptive)\r
+void INL_GetJoyDelta(word joy,int *dx,int *dy/*,boolean adaptive*/)\r
{\r
word x,y;\r
- word time;\r
word TimeCount = *clockw;\r
JoystickDef *def;\r
static word lasttime;\r
}\r
else\r
*dy = 0;\r
-\r
- if (adaptive)\r
- {\r
- time = (TimeCount - lasttime) / 2;\r
- if (time)\r
- {\r
- if (time > 8)\r
- time = 8;\r
- *dx *= time;\r
- *dy *= time;\r
- }\r
- }\r
+// if (adaptive)\r
+// {\r
+// time = (TimeCount - lasttime) / 2;\r
+// if (time)\r
+// {\r
+// if (time > 8)\r
+// time = 8;\r
+// *dx *= time;\r
+// *dy *= time;\r
+// }\r
+// }\r
lasttime = TimeCount;\r
}\r
\r
{\r
register word result;\r
\r
- result = inp(0x201); // Get all the joystick buttons\r
+ result = inportb(0x201); // Get all the joystick buttons\r
result >>= joy? 6 : 4; // Shift into bits 0-1\r
result &= 3; // Mask off the useless bits\r
result ^= 3;\r
result1 = INL_GetJoyButtons(joy);\r
lasttime = TimeCount;\r
while(TimeCount == lasttime)\r
+ //;\r
result2 = INL_GetJoyButtons(joy);\r
} while(result1 != result2);\r
return(result1);\r
//\r
///////////////////////////////////////////////////////////////////////////\r
static void\r
-INL_StartKbd()\r
+INL_StartKbd(void)\r
{\r
- byte far *lock_key;\r
- INL_KeyHook = 0; // Clear key hook\r
+ INL_KeyHook = NULL; // Clear key hook\r
\r
IN_ClearKeysDown();\r
\r
- OldKeyVect = _dos_getvect(KeyInt);\r
-\r
- // turn off num-lock via BIOS\r
- lock_key = MK_FP(0x040, 0x017); // Pointing to the address of the bios shift state keys\r
- *lock_key&=(~(16 | 32 | 64)); // toggle off the locks by changing the values of the 4th, 5th, and 6th bits of the address byte of 0040:0017\r
- OldKeyVect(); // call BIOS keyhandler to change keyboard lights\r
- _dos_setvect(KeyInt,INL_KeyService);\r
+ OldKeyVect = getvect(KeyInt);//IN_KbdLED();\r
+ setvect(KeyInt,INL_KeyService);\r
}\r
\r
///////////////////////////////////////////////////////////////////////////\r
{\r
pokeb(0x40,0x17,peekb(0x40,0x17) & 0xfaf0); // Clear ctrl/alt/shift flags\r
\r
- _dos_setvect(KeyInt,OldKeyVect);\r
+ setvect(KeyInt,OldKeyVect);\r
}\r
\r
///////////////////////////////////////////////////////////////////////////\r
static boolean\r
INL_StartMouse(void)\r
{\r
- union REGS CPURegs;\r
- if(_dos_getvect(MouseInt))\r
+#if 0\r
+ if (getvect(MouseInt))\r
{\r
Mouse(MReset);\r
- if(CPURegs.x.ax == 0xffff)\r
+ if (_AX == 0xffff)\r
return(true);\r
}\r
return(false);\r
+#endif\r
+ byte far *vector;\r
+\r
+\r
+ if ((vector=MK_FP(peek(0,0x33*4+2),peek(0,0x33*4)))==NULL)\r
+ return false;\r
+\r
+ if (*vector == 207)\r
+ return false;\r
+\r
+ Mouse(MReset);\r
+ return true;\r
}\r
\r
///////////////////////////////////////////////////////////////////////////\r
//in.KbdDefs[0].downleft = 0x4f;\r
inpu.KbdDefs[0].down = 0x50;\r
//in.KbdDefs[0].downright = 0x51;\r
- IN_SetControlType(0,player,nt);\r
+ IN_SetControlType(player,nt);\r
for(i=0; i>MaxPlayers;i++)\r
player[i].enti.d =2;\r
}\r
//\r
///////////////////////////////////////////////////////////////////////////\r
void\r
-IN_Shutdown()\r
+IN_Shutdown(void)\r
{\r
word i;\r
\r
\r
///////////////////////////////////////////////////////////////////////////\r
//\r
-// IN_ClearKeyDown() - Clears the keyboard array\r
+// IN_ClearKeysDown() - Clears the keyboard array\r
//\r
///////////////////////////////////////////////////////////////////////////\r
void\r
-IN_ClearKeysDown()\r
+IN_ClearKeysDown(void)\r
{\r
//int i;\r
\r
continue;\r
\r
buttons = INL_GetJoyButtons(i);\r
- INL_GetJoyDelta(i,&dx,&dy,true);\r
+ INL_GetJoyDelta(i,&dx,&dy/*,true*/);\r
dx /= 64;\r
dy /= 64;\r
INL_AdjustCursor(info,buttons,dx,dy);\r
}\r
}\r
\r
+//if else for gfxtesting and direction\r
+#define DIRECTIONIFELSE (player->info.dir == 2)\r
+//#define NDIRECTIONIFELSE (player->info.dir != 2)\r
+\r
///////////////////////////////////////////////////////////////////////////\r
//\r
// IN_ReadControl() - Reads the device associated with the specified\r
// player and fills in the control info struct\r
//\r
///////////////////////////////////////////////////////////////////////////\r
-void near\r
-IN_ReadControl(word pn, player_t *player)\r
+void\r
+IN_ReadControl(player_t *player)\r
{\r
boolean realdelta;\r
#if DEMO0\r
else\r
{\r
#endif\r
- switch (type = player[pn].Controls)\r
+ switch (type = player->Controls)\r
{\r
case ctrl_Keyboard1:\r
case ctrl_Keyboard2:\r
else if (Keyboard[def->downright])\r
mx = motion_Right,my = motion_Down;*/\r
//TODO: make this into a function that the joystick AND keyboard can use wwww\r
- if(DIRECTIONIFELSE)//(player[pn].info.dir == 2)\r
+ if(DIRECTIONIFELSE)//(player->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
if((inpu.Keyboard[def->right] && !inpu.Keyboard[def->left]))\r
mx = motion_Right;\r
}else{ //2 keys pressed\r
- switch (player[pn].pdir)\r
+ switch (player->pdir)\r
{\r
case 0:\r
case 4:\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
+ //if(dbg_testcontrolnoisy > 0){ printf("dir=%c ", dirchar(dir)); printf("pdir=%c ", dirchar(player->pdir)); }\r
#endif\r
}\r
}\r
break;\r
case ctrl_Joystick1:\r
case ctrl_Joystick2:\r
- INL_GetJoyDelta(type - ctrl_Joystick,&dx,&dy,false);\r
+ INL_GetJoyDelta(type - ctrl_Joystick,&dx,&dy/*,false*/);\r
buttons = INL_GetJoyButtons(type - ctrl_Joystick);\r
realdelta = true;\r
break;\r
dy = my;// * 127;\r
}\r
\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
+ player->info.x = dx;\r
+ player->info.xaxis = mx;\r
+ player->info.y = dy;\r
+ player->info.yaxis = my;\r
+ player->info.button0 = buttons & (1 << 0);\r
+ player->info.button1 = buttons & (1 << 1);\r
+ player->info.button2 = buttons & (1 << 2);\r
+ player->info.button3 = buttons & (1 << 3);\r
+// player->info.dir = DirTable[((my + 1) * 3) + (mx + 1)];\r
conpee=(((my + 1) * 2) + (mx + 1))-1;\r
- player[pn].info.dir = DirTable[conpee];\r
+ player->info.dir = DirTable[conpee];\r
\r
- if(DirTable[conpee]!=2) player[pn].pdir=DirTable[conpee];\r
- if(player[pn].enti.q==1 &&( dir!=2 || (mx!=motion_None || my!=motion_None)))\r
+ if(DirTable[conpee]!=2) player->pdir=DirTable[conpee];\r
+ if(player->enti.q==1 &&( dir!=2 || (mx!=motion_None || my!=motion_None)))\r
{\r
- if(dir==2) player[pn].enti.d = player[pn].info.dir;\r
- else player[pn].enti.d = DirTable[dir];\r
+ if(dir==2) player->enti.d = player->info.dir;\r
+ else player->enti.d = DirTable[dir];\r
}\r
\r
#if DEMO0\r
#endif\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].enti.q>1)\r
+if(player->info.dir!=2/*(inpu.Keyboard[def->up] || inpu.Keyboard[def->down] || inpu.Keyboard[def->left] || inpu.Keyboard[def->right])*/ || player->enti.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].enti.q);\r
+ //printf("b1=%u b2=%u b3=%u b4=%u ", player->info.button0, player->info.button1, player->info.button2, player->info.button3);\r
+ //printf("q=%d ", player->enti.q);\r
//printf("cpee=%c ", dirchar(conpee));\r
- printf("pdir=%c d=%c dir=%c ", dirchar(player[pn].pdir), dirchar(player[pn].enti.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
+ printf("pdir=%c d=%c dir=%c ", dirchar(player->pdir), dirchar(player->enti.d), dirchar(player->info.dir));\r
+ /*if(realdelta) */printf("dx=%d dy=%d mx=%d my=%d", player->info.x, player->info.y, player->info.xaxis, player->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
//\r
///////////////////////////////////////////////////////////////////////////\r
void\r
-IN_SetControlType(word pn,player_t *player,ControlType type)\r
+IN_SetControlType(player_t *player,ControlType type)\r
{\r
// DEBUG - check that requested type is present?\r
- player[pn].Controls = type;\r
+ player->Controls = type;\r
}\r
\r
#if DEMO0\r
//\r
///////////////////////////////////////////////////////////////////////////\r
ScanCode\r
-IN_WaitForKey()\r
+IN_WaitForKey(void)\r
{\r
ScanCode result;\r
\r
//\r
///////////////////////////////////////////////////////////////////////////\r
char\r
-IN_WaitForASCII()\r
+IN_WaitForASCII(void)\r
{\r
char result;\r
\r
\r
///////////////////////////////////////////////////////////////////////////\r
//\r
-// IN_AckBack() - Waits for either an ASCII keypress or a button press\r
+// IN_Ack() - waits for a button or key press. If a button is down, upon\r
+// calling, it must be released for it to be recognized\r
//\r
///////////////////////////////////////////////////////////////////////////\r
-void\r
-IN_AckBack()\r
+\r
+boolean btnstate[8];\r
+\r
+void IN_StartAck(void)\r
{\r
- word i;\r
+ unsigned i,buttons;\r
\r
- while (!inpu.LastScan)\r
- {\r
- if (inpu.MousePresent)\r
- {\r
- if (INL_GetMouseButtons())\r
- {\r
- while (INL_GetMouseButtons())\r
- ;\r
- return;\r
- }\r
- }\r
+//\r
+// get initial state of everything\r
+//\r
+ IN_ClearKeysDown();\r
+ memset (btnstate,0,sizeof(btnstate));\r
\r
- for (i = 0;i < MaxJoys;i++)\r
- {\r
- if (inpu.JoysPresent[i])\r
- {\r
- if (IN_GetJoyButtonsDB(i))\r
- {\r
- while (IN_GetJoyButtonsDB(i))\r
- ;\r
- return;\r
- }\r
- }\r
- }\r
- }\r
+ buttons = IN_JoyButtons () << 4;\r
+ if (inpu.MousePresent)\r
+ buttons |= IN_MouseButtons ();\r
\r
- IN_ClearKey(inpu.LastScan);\r
- inpu.LastScan = sc_None;\r
+ for (i=0;i<8;i++,buttons>>=1)\r
+ if (buttons&1)\r
+ btnstate[i] = true;\r
}\r
\r
-///////////////////////////////////////////////////////////////////////////\r
+\r
+boolean IN_CheckAck (void)\r
+{\r
+ unsigned i,buttons;\r
+\r
//\r
-// IN_Ack() - Clears user input & then calls IN_AckBack()\r
+// see if something has been pressed\r
//\r
-///////////////////////////////////////////////////////////////////////////\r
-void\r
-IN_Ack()\r
-{\r
- word i;\r
+ if (inpu.LastScan)\r
+ return true;\r
\r
- if (!inst.IN_Started)\r
- return;\r
+ buttons = IN_JoyButtons () << 4;\r
+ if (inpu.MousePresent)\r
+ buttons |= IN_MouseButtons ();\r
\r
- IN_ClearKey(inpu.LastScan);\r
- inpu.LastScan = sc_None;\r
+ for (i=0;i<8;i++,buttons>>=1)\r
+ if ( buttons&1 )\r
+ {\r
+ if (!btnstate[i])\r
+ return true;\r
+ }\r
+ else\r
+ btnstate[i]=false;\r
+\r
+ return false;\r
+}\r
\r
- if (inpu.MousePresent)\r
- while (INL_GetMouseButtons())\r
- ;\r
- for (i = 0;i < MaxJoys;i++)\r
- if (inpu.JoysPresent[i])\r
- while (IN_GetJoyButtonsDB(i))\r
- ;\r
\r
- IN_AckBack();\r
+void IN_Ack (void)\r
+{\r
+ IN_StartAck ();\r
+\r
+ while (!IN_CheckAck ())\r
+ ;\r
}\r
\r
///////////////////////////////////////////////////////////////////////////\r
// button up.\r
//\r
///////////////////////////////////////////////////////////////////////////\r
-boolean\r
-IN_UserInput(dword delay,boolean clear)\r
+boolean IN_UserInput(word delay)\r
{\r
word TimeCount = *clockw;\r
word lasttime;\r
\r
lasttime = TimeCount;\r
+ IN_StartAck ();\r
do\r
{\r
- if (IN_IsUserInput())\r
- {\r
- if (clear)\r
- IN_AckBack();\r
- return(true);\r
- }\r
+ if (IN_CheckAck())\r
+ return true;\r
} while (TimeCount - lasttime < delay);\r
return(false);\r
}\r
{\r
byte joybits;\r
\r
- joybits = inp(0x201); // Get all the joystick buttons\r
+ joybits = inportb(0x201); // Get all the joystick buttons\r
joybits >>= 4; // only the high bits are useful\r
joybits ^= 15; // return with 1=pressed\r
\r
{\r
return inst.CurCode;\r
}\r
+\r
+void IN_KbdLED()\r
+{\r
+ byte far *lock_key;\r
+\r
+ // turn off num-lock via BIOS\r
+ lock_key = MK_FP(0x040, 0x017); // Pointing to the address of the bios shift state keys\r
+ *lock_key&=(~(16 | 32 | 64)); // toggle off the locks by changing the values of the 4th, 5th, and 6th bits of the address byte of 0040:0017\r
+ OldKeyVect(); // call BIOS keyhandler to change keyboard lights\r
+}\r
projects / 16.git / blobdiff