inpu?

	modified:   16.exe
	modified:   exmmtest.exe
	modified:   inputest.exe
	modified:   maptest.exe
	modified:   src/inputest.c
	modified:   src/lib/16_head.h
	modified:   src/lib/16_in.c
	modified:   src/lib/16_in.h

diff --git a/16.exe b/16.exe
index 30dfc54d2380e82549fcb96a43a9ebc765176e14..d407dac141d591d9fa2508db9ccc8bcbbb848d09 100644 (file)
Binary files a/16.exe and b/16.exe differ

diff --git a/exmmtest.exe b/exmmtest.exe
index 0168bc743c57fb10aafd389426acfca4b417afc3..4bd6a747a6cc8b7e119261a328369acfbeb69787 100644 (file)
Binary files a/exmmtest.exe and b/exmmtest.exe differ

diff --git a/inputest.exe b/inputest.exe
index 7226e14df2387ad047343a3fbdae0848384e76fe..d28c807741fe9bc072bd4a9310f00af770e32bfd 100644 (file)
Binary files a/inputest.exe and b/inputest.exe differ

diff --git a/maptest.exe b/maptest.exe
index f634cd39355a77c0d456f5ffcdab5f9d2cee8146..ed045368a4287c97ed7f59fe3d316b18717c5432 100644 (file)
Binary files a/maptest.exe and b/maptest.exe differ

diff --git a/src/inputest.c b/src/inputest.c
index 6fdf5567f927dee9fede288c123565d34385dff9..7818a8a38fa6cbedf575ce9d227aab39d8cdb1b2 100644 (file)
--- a/src/inputest.c
+++ b/src/inputest.c
@@ -38,7 +38,7 @@ main(int argc, char *argv[])
                IN_ReadControl(0,&player);
                //printf("%u\n", IN_KeyDown(sc_Escape));
                //printf("%u\n", IN_qb(sc_Escape));
-               clockdw++;
+               //clockdw++;
        }
        IN_Shutdown();
        //printf("%u\n", in.Keyboard[sc_Escape]);\r

diff --git a/src/lib/16_head.h b/src/lib/16_head.h
index 2bb380febd530be11f5f5c3ad862c457bbef9444..cb491f70accbd82097ab6863d0c54a5144a8aed9 100644 (file)
--- a/src/lib/16_head.h
+++ b/src/lib/16_head.h
@@ -131,8 +131,8 @@
 #define KEY_MENU               (0x75)
 */
 
-//static dword far* clockdw= (dword far*) 0x046C; /* 18.2hz clock */
-static dword clockdw=0;
+static dword far* clockdw= (dword far*) 0x046C; /* 18.2hz clock */
+//static dword clockdw=0;
 
 #define        nil     ((void *)0)
 

diff --git a/src/lib/16_in.c b/src/lib/16_in.c
index 4dd9aa0cc3feb7b7230c851a94c79de07eaf85d9..2878be77c71f4c15d9eb6c645f1b4c26a7432bef 100644 (file)
--- a/src/lib/16_in.c
+++ b/src/lib/16_in.c
@@ -371,7 +371,7 @@ INL_GetJoyDelta(word joy,int *dx,int *dy,boolean adaptive)
 {\r
        word            x,y;\r
        dword   time;\r
-       dword TimeCount = /***/clockdw;\r
+       dword TimeCount = *clockdw;\r
        JoystickDef     *def;\r
 static dword   lasttime;\r
 \r
@@ -465,7 +465,7 @@ register    word    result;
 word\r
 IN_GetJoyButtonsDB(word joy)\r
 {\r
-       dword TimeCount = /***/clockdw;\r
+       dword TimeCount = *clockdw;\r
        dword   lasttime;\r
        word            result1,result2;\r
 \r
@@ -1176,7 +1176,7 @@ IN_IsUserInput()
 boolean\r
 IN_UserInput(dword delay,boolean clear)\r
 {\r
-       dword TimeCount = /***/clockdw;\r
+       dword TimeCount = *clockdw;\r
        dword   lasttime;\r
 \r
        lasttime = TimeCount;\r

diff --git a/src/lib/16_in.h b/src/lib/16_in.h
index daa864c811758b1b398fbd98796bfa14ce2b8fba..8e20760e71415f78f14098cf2af6fa518302939d 100644 (file)
--- a/src/lib/16_in.h
+++ b/src/lib/16_in.h
@@ -251,7 +251,7 @@ typedef     struct
                static word             DemoOffset,DemoSize;\r
 #endif\r
 \r
-extern dword /*far**/ clockdw;\r
+extern dword far* clockdw;\r
 \r
 //     Internal routines\r
 extern void interrupt INL_KeyService();\r