wwww

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

diff --git a/16.LIB b/16.LIB
index 0cafbb6203f2fd5b31d95b56b8df5ac9d830c3f7..3544d58ffb6913fb1d8070c527c4c9b819ff23a5 100644 (file)
Binary files a/16.LIB and b/16.LIB differ

diff --git a/inputest.exe b/inputest.exe
index bc2720974a667a700f2cb428eb21442cbcff94cc..db576b8436a593aa203dd831f5caa25d98f11b25 100644 (file)
Binary files a/inputest.exe and b/inputest.exe differ

diff --git a/src/inputest.c b/src/inputest.c
index 8d94fcd30070efda16a45a248b184622c5d4b456..76265e73470111d3e1c592b8897d7fbe6dccc4bf 100644 (file)
--- a/src/inputest.c
+++ b/src/inputest.c
@@ -30,7 +30,7 @@ main(int argc, char *argv[])
        ControlInfo control;\r
        extern boolean Keyboard[NumCodes];\r
        IN_Startup();\r
-       IN_Default(0,ctrl_Keyboard);\r
+       IN_Default(0,ctrl_Joystick);\r
        while(!IN_qb(sc_Escape))\r
        {\r
                IN_ReadControl(0,&control);\r

diff --git a/src/lib/16_in.c b/src/lib/16_in.c
index e3832dcf6ccda8737d197d64aa3fe9dd43bf40f8..c8fd62660767f640a981db1ab5a34aa3d86973d6 100644 (file)
--- a/src/lib/16_in.c
+++ b/src/lib/16_in.c
@@ -19,8 +19,9 @@
 //
 //     ID Engine
 //     ID_IN.c - Input Manager
-//     v1.0d1
+//     v1.0d1w
 //     By Jason Blochowiak
+// Open Watcom port by sparky4
 //
 
 //
@@ -463,14 +464,14 @@ IN_SetupJoy(word joy,word minx,word maxx,word miny,word maxy)
        def->joyMinX = minx;
        def->joyMaxX = maxx;
        r = maxx - minx;
-       d = r / 5;
+       d = r / 3;
        def->threshMinX = ((r / 2) - d) + minx;
        def->threshMaxX = ((r / 2) + d) + minx;
 
        def->joyMinY = miny;
        def->joyMaxY = maxy;
        r = maxy - miny;
-       d = r / 5;
+       d = r / 3;
        def->threshMinY = ((r / 2) - d) + miny;
        def->threshMaxY = ((r / 2) + d) + miny;
 
@@ -534,7 +535,7 @@ IN_Startup(void)
        checkmouse = true;
        for (i = 1;i < __argc;i++)
        {
-               switch (US_CheckParm(__argv[i],ParmStrings))
+               switch (US_CheckParm(__argv[i],ParmStringsIN))
                {
                case 0:
                        checkjoys = false;
@@ -618,8 +619,7 @@ IN_ClearKeysDown(void)
 
        LastScan = sc_None;
        LastASCII = key_None;
-       for (i = 0;i < NumCodes;i++)
-               Keyboard[i] = false;
+       memset (Keyboard,0,sizeof(Keyboard));
 }
 
 ///////////////////////////////////////////////////////////////////////////

diff --git a/src/lib/16_in.h b/src/lib/16_in.h
index 7cc143725578b3bf812312e8f18fac064221e5a5..542f6e29e181f87faf432c14241225133ced9e3c 100644 (file)
--- a/src/lib/16_in.h
+++ b/src/lib/16_in.h
@@ -19,13 +19,15 @@
 //\r
 //     ID Engine\r
 //     ID_IN.h - Header file for Input Manager\r
-//     v1.0d1\r
-//     By Jason Blochowiak\r
+//     v1.0d1w\r
+//     By Jason Blochowiak
+// Open Watcom port by sparky4\r
 //\r
 \r
 #ifndef        __16_IN__\r
 #define        __16_IN__\r
-\r
+
+#include <string.h>\r
 #include "src/lib/lib_head.h"\r
 //#include "src/lib/16_us.h"\r
 \r
@@ -291,7 +293,7 @@ static      Direction       DirTable[] =            // Quick lookup for total direction
 static void                    (*INL_KeyHook)(void);\r
 static void interrupt  (*OldKeyVect)(void);\r
 \r
-static char                    *ParmStrings[] = {"nojoys","nomouse",nil};\r
+static char                    *ParmStringsIN[] = {"nojoys","nomouse",nil};\r
 \r
 // Function prototypes\r
 #define        IN_KeyDown(code)        (Keyboard[(code)])\r