input perfected and ready for graphical system!

	deleted:    16.LIB
	deleted:    GFX.LIB
	modified:   inputest.exe
	modified:   src/lib/16_in.c
	modified:   src/lib/16_in.h
	modified:   src/lib/lib_head.h

diff --git a/16.LIB b/16.LIB
deleted file mode 100644 (file)
index f2152fb..0000000
Binary files a/16.LIB and /dev/null differ

diff --git a/GFX.LIB b/GFX.LIB
deleted file mode 100644 (file)
index 2dc73f5..0000000
Binary files a/GFX.LIB and /dev/null differ

diff --git a/inputest.exe b/inputest.exe
index 43c45e3a78f11b3da573af6d3a51799aaba72402..30685259bcd88c21dd3dad524d8e88060bc3647c 100644 (file)
Binary files a/inputest.exe and b/inputest.exe differ

diff --git a/src/lib/16_in.c b/src/lib/16_in.c
index b19702d088ccabb92f92e633b89ea6c3a3102f59..539c8c3c426bcf446004e526a793523c428656e9 100644 (file)
--- a/src/lib/16_in.c
+++ b/src/lib/16_in.c
@@ -149,12 +149,15 @@ static    byte        far ASCIINames[] =          // Unshifted ASCII for scan codes
 \r
 static Direction       DirTable[] =            // Quick lookup for total direction\r
                                        {\r
-                                               //dir_Nortinest,\r
-                                               dir_North,\r
+                                               //dir_Nortinest,
+                                               dir_North,
+                                               dir_West,\r
+                                               dir_None,       \r
+                                               dir_East,
+                                               dir_South
                                                //dir_NorthEast,\r
-                                               dir_West,               dir_None,       dir_East,\r
                                                //dir_Soutinest,\r
-                                               dir_South//,dir_SouthEast\r
+                                               //,dir_SouthEast\r
                                        };\r
 #ifdef __cplusplus\r
 }\r
@@ -674,7 +677,7 @@ IN_Default(boolean gotit,player_t *player,ControlType nt)
        ||      ((nt == ctrl_Joypad2) && !inpu.JoyPadPresent[1])\r
        )\r
                nt = ctrl_Keyboard1;\r
-       inpu.KbdDefs[0].button0 = 0x1d;\r
+       inpu.KbdDefs[0].button0 = 0x1c;\r
        inpu.KbdDefs[0].button1 = 0x38;\r
        //in.KbdDefs[0].upleft = 0x47;\r
        inpu.KbdDefs[0].up = 0x48;\r
@@ -846,18 +849,18 @@ register  KeyboardDef     *def;
                        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->left] && !inpu.Keyboard[def->right]){\r
                        if (inpu.Keyboard[def->up])\r
                                my = motion_Up;\r
                        else if (inpu.Keyboard[def->down])\r
                                my = motion_Down;\r
 \r
-                       }else 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])\r
                                mx = motion_Left;\r
                        else if (inpu.Keyboard[def->right])\r
                                mx = motion_Right;\r
-                       }\r
+                       //}\r
                        if (inpu.Keyboard[def->button0])\r
                                buttons += 1 << 0;\r
                        if (inpu.Keyboard[def->button1])\r
@@ -903,7 +906,8 @@ register    KeyboardDef     *def;
        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)];\r
+//     player[playnum].info.dir = DirTable[((my + 1) * 3) + (mx + 1)];
+       player[playnum].info.dir = DirTable[(((my + 1) * 2) + (mx + 1))-1];\r
 \r
 #if DEMO0\r
        if (DemoMode == demo_Record)\r
@@ -930,8 +934,13 @@ register   KeyboardDef     *def;
                }\r
        }\r
 #endif\r
-#ifdef TESTCONTROLNOISY\r
-printf("dir=%d\n", player[playnum].info.dir);\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);
+}\r
 #endif\r
 }\r
 \r

diff --git a/src/lib/16_in.h b/src/lib/16_in.h
index efe70039fa0dcdd5270cc0694a630af8cb73f247..5aeecc077fe4d043ae836b52fd58d3aeadabc4a6 100644 (file)
--- a/src/lib/16_in.h
+++ b/src/lib/16_in.h
@@ -30,12 +30,14 @@
 #include <string.h>\r
 #include "src/lib/lib_head.h"\r
 \r
-//++++#ifdef   __DEBUG__\r
+#ifdef __DEBUG__\r
 #define        __DEBUG_InputMgr__\r
-//++++#endif\r
+#endif
 \r
+#ifdef __DEBUG_InputMgr__\r
 #define TESTKEYIN
-//#define TESTCONTROLNOISY\r
+#define TESTCONTROLNOISY
+#endif\r
 \r
 #define        KeyInt  9       // The keyboard ISR number\r
 \r
@@ -164,12 +166,12 @@ typedef   enum            {
                                                motion_None = 0,\r
                                                motion_Right = 1,motion_Down = 1\r
                                        } Motion;\r
-typedef        enum            {\r
-                                               dir_North,//dir_NorthEast,\r
-                                               dir_East,//dir_SouthEast,\r
-                                               dir_South,//dir_Soutinest,\r
-                                               dir_West,//dir_Nortinest,\r
-                                               dir_None\r
+typedef        enum            {
+                                               dir_North,//dir_NorthEast,
+                                               dir_West,//dir_Nortinest,
+                                               dir_None,\r
+                                               dir_East,//,dir_SouthEast,
+                                               dir_South,//dir_Soutinest,
                                        } Direction;\r
 typedef        struct          {\r
                                                boolean         button0,button1,button2,button3;\r
@@ -181,11 +183,12 @@ typedef   struct          {
 typedef        struct          {\r
                                                ScanCode        button0,button1,\r
                                                                        //upleft,\r
-                                                                       up,\r
+                                                                       up,
+                                                                       down,
+                                                                       left,
+                                                                       right\r
                                                                        //upright,\r
-                                                                       left,                           right,\r
                                                                        //downleft,\r
-                                                                       down\r
                                                                        //,downright\r
                                                                        ;\r
                                        } KeyboardDef;\r

diff --git a/src/lib/lib_head.h b/src/lib/lib_head.h
index cf50054db81d27a97944abb6d3e47069ae66b74c..225af5d354ee86aac265b88670d2c9b53590c24a 100644 (file)
--- a/src/lib/lib_head.h
+++ b/src/lib/lib_head.h
@@ -127,6 +127,8 @@ static dword far* clockdw= (dword far*) 0x046C; /* 18.2hz clock */
 
 #define        nil     ((void *)0)
 
+#define __DEBUG__
+
 #define peekb(segm,ofs) (*(byte far*)MK_FP((segm),(ofs)))\r
 #define peekw(segm,ofs) (*(word far*)MK_FP((segm),(ofs)))\r
 #define pokeb(segm,ofs,value) (peekb((segm),(ofs)) = (byte)(value))\r