tired i will work on joy stick stuff later

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

diff --git a/src/lib/16_in.c b/src/lib/16_in.c
index c543caf99a958a7d4a484c5c0444ce67bfb16954..9dd9d7816b7ba043cccccfca9d0ab9c46faf2694 100755 (executable)
--- a/src/lib/16_in.c
+++ b/src/lib/16_in.c
@@ -251,13 +251,13 @@ static    boolean special;
 \r
 void INL_Mouse(int x)\r
 {\r
-       //union REGS CPURegs;\r
-       //x = CPURegs.x.ax;\r
-       __asm {\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
+       int86(MouseInt,&CPURegs,&CPURegs);\r
 }\r
 \r
 ///////////////////////////////////////////////////////////////////////////\r
@@ -273,6 +273,12 @@ INL_GetMouseDelta(int *x,int *y)
        Mouse(MDelta);\r
        *x = CPURegs.x.cx;\r
        *y = CPURegs.x.dx;\r
+#ifdef __DEBUG_InputMgr__\r
+       if(dbg_joymousedelta)\r
+       {\r
+               printf("mousedelta=[%dx%d]\n", *x, *y);\r
+       }\r
+       #endif\r
 }\r
 \r
 ///////////////////////////////////////////////////////////////////////////\r
@@ -535,15 +541,15 @@ INL_ShutKbd(void)
 static boolean\r
 INL_StartMouse(void)\r
 {\r
-#if 0\r
+       union REGS CPURegs;\r
        if (getvect(MouseInt))\r
        {\r
                Mouse(MReset);\r
-               if (_AX == 0xffff)\r
+               if (/*_AX*/CPURegs.x.ax == 0xffff)\r
                        return(true);\r
        }\r
        return(false);\r
-#endif\r
+#if 0\r
        byte far *vector;\r
 \r
 \r
@@ -555,6 +561,7 @@ INL_StartMouse(void)
 \r
        Mouse(MReset);\r
        return true;\r
+#endif\r
 }\r
 \r
 ///////////////////////////////////////////////////////////////////////////\r
@@ -850,6 +857,9 @@ IN_ReadControl(player_t *player, global_game_variables_t *gvar)
                        sword conpee;\r
                        byte dir=DirTable[2];\r
 register       KeyboardDef     *def;\r
+//#ifdef __DEBUG_InputMgr__\r
+//static               int                     old_dx,old_dy;\r
+//#endif\r
 \r
        dx = dy = 0;\r
        mx = my = motion_None;\r
@@ -1004,6 +1014,13 @@ register KeyboardDef     *def;
        }\r
 #endif\r
 #ifdef __DEBUG_InputMgr__\r
+/*if(dbg_joymousedelta)\r
+{\r
+       if(dx!=old_dx || dy!=old_dy) printf("dx,dy      [%d,%d] %d,%d\n", dx, dy, mx, my);\r
+       if(dx!=old_dx)  old_dx=dx;\r
+       if(dy!=old_dy)  old_dy=dy;\r
+}*/\r
+\r
 if(dbg_testcontrolnoisy > 0)\r
 if(player->info.dir!=2/*(inst.Keyboard[def->up] || inst.Keyboard[def->down] || inst.Keyboard[def->left] || inst.Keyboard[def->right])*/ || player->enti.q>1)\r
 {\r