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 d407dac..30dfc54 100644 (file)
Binary files a/16.exe and b/16.exe differ

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

diff --git a/inputest.exe b/inputest.exe
index 2befbe0..4eac314 100644 (file)
Binary files a/inputest.exe and b/inputest.exe differ

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

diff --git a/src/inputest.c b/src/inputest.c
index 5df1f39..6fdf556 100644 (file)
--- a/src/inputest.c
+++ b/src/inputest.c
@@ -23,7 +23,7 @@
        input test\r
 */\r
 #include "src/lib/16_in.h"\r
-\r
+
 void\r
 main(int argc, char *argv[])\r
 {
@@ -37,7 +37,8 @@ main(int argc, char *argv[])
        {
                IN_ReadControl(0,&player);
                //printf("%u\n", IN_KeyDown(sc_Escape));
-               //printf("%u\n", IN_qb(sc_Escape));\r
+               //printf("%u\n", IN_qb(sc_Escape));
+               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 19e713b..2bb380f 100644 (file)
--- a/src/lib/16_head.h
+++ b/src/lib/16_head.h
@@ -131,7 +131,8 @@
 #define KEY_MENU               (0x75)
 */
 
-static dword far* clockdw= (dword far*) 0x046C; /* 18.2hz clock */
+//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 2878be7..4dd9aa0 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 9a9c768..fe621bc 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