pmnextframe readded ca needs huge amounts of work and i should remember what needs...

[16.git] / src / lib / 16_in.c

diff --git a/src/lib/16_in.c b/src/lib/16_in.c
index 314ddbfd2318fc15ed845e2f22bb94902e78dfef..a6b43dfbb22784e1a6b2c9358b38a1b699027c8d 100755 (executable)
--- a/src/lib/16_in.c
+++ b/src/lib/16_in.c
@@ -501,11 +501,17 @@ IN_GetJoyButtonsDB(word joy)
 static void\r
 INL_StartKbd()\r
 {\r
+       byte far *lock_key;\r
        INL_KeyHook = 0;        // 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
 }\r
 \r
@@ -703,7 +709,7 @@ IN_Default(boolean gotit,player_t *player,ControlType nt)
        //in.KbdDefs[0].downright = 0x51;\r
        IN_SetControlType(0,player,nt);\r
        for(i=0; i>MaxPlayers;i++)\r
-               player[i].d=2;\r
+               player[i].enti.d =2;\r
 }\r
 \r
 ///////////////////////////////////////////////////////////////////////////\r
@@ -814,7 +820,7 @@ IN_ReadCursor(CursorInfo *info)
 //\r
 ///////////////////////////////////////////////////////////////////////////\r
 void near\r
-IN_ReadControl(int pn,player_t *player)\r
+IN_ReadControl(word pn, player_t *player)\r
 {\r
                        boolean         realdelta;\r
 #if DEMO0\r
@@ -949,10 +955,10 @@ register  KeyboardDef     *def;
        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
+       if(player[pn].enti.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
+               if(dir==2) player[pn].enti.d = player[pn].info.dir;\r
+               else player[pn].enti.d = DirTable[dir];\r
        }\r
 \r
 #if DEMO0\r
@@ -982,12 +988,12 @@ register  KeyboardDef     *def;
 #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].q>1)\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
 {\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("q=%d ", player[pn].enti.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("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
        //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
@@ -1245,15 +1251,57 @@ IN_UserInput(dword delay,boolean clear)
        return(false);\r
 }\r
 \r
+//===========================================================================\r
+\r
+/*\r
+===================\r
+=\r
+= IN_MouseButtons\r
+=\r
+===================\r
+*/\r
+\r
+byte   IN_MouseButtons (void)\r
+{\r
+       union REGS CPURegs;\r
+       if (inpu.MousePresent)\r
+       {\r
+               Mouse(MButtons);\r
+               return CPURegs.x.bx;\r
+       }\r
+       else\r
+               return 0;\r
+}\r
+\r
+\r
+/*\r
+===================\r
+=\r
+= IN_JoyButtons\r
+=\r
+===================\r
+*/\r
+\r
+byte   IN_JoyButtons (void)\r
+{\r
+       byte joybits;\r
+\r
+       joybits = inp(0x201);   // Get all the joystick buttons\r
+       joybits >>= 4;                          // only the high bits are useful\r
+       joybits ^= 15;                          // return with 1=pressed\r
+\r
+       return joybits;\r
+}\r
+\r
 boolean IN_KeyDown(byte code)\r
 {\r
 #ifdef __DEBUG_InputMgr__\r
-       if(!dbg_notest)\r
+       if(!dbg_nointest)\r
 #endif\r
        return inpu.Keyboard[code];\r
 #ifdef __DEBUG_InputMgr__\r
        else\r
-               if(dbg_notest && kbhit())\r
+               if(dbg_nointest && kbhit())\r
                        return 1;\r
                else\r
                        return 0;\r
@@ -1276,21 +1324,12 @@ boolean IN_qb(byte kee)
        else return 0;\r
 }\r
 \r
-//init player!\r
-void IN_initplayer(player_t *player, word pn)\r
+ScanCode IN_GetLastScan()\r
+{\r
+       return inpu.LastScan;\r
+}\r
+\r
+ScanCode IN_GetCurCode()\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
+       return inst.CurCode;\r
 }\r