From: sparky4 <sparky4@cock.li>
Date: Sun, 12 Jul 2015 19:29:27 +0000 (-0500)
Subject: inpu?
X-Git-Url: http://4ch.mooo.com/gitweb/?a=commitdiff_plain;h=b653a5ce33432229e31e2e661a2283d7f277676c;p=16.git

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 30dfc54d..d407dac1 100644
Binary files a/16.exe and b/16.exe differ
diff --git a/exmmtest.exe b/exmmtest.exe
index 0168bc74..4bd6a747 100644
Binary files a/exmmtest.exe and b/exmmtest.exe differ
diff --git a/inputest.exe b/inputest.exe
index 7226e14d..d28c8077 100644
Binary files a/inputest.exe and b/inputest.exe differ
diff --git a/maptest.exe b/maptest.exe
index f634cd39..ed045368 100644
Binary files a/maptest.exe and b/maptest.exe differ
diff --git a/src/inputest.c b/src/inputest.c
index 6fdf5567..7818a8a3 100644
--- 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]);
diff --git a/src/lib/16_head.h b/src/lib/16_head.h
index 2bb380fe..cb491f70 100644
--- 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 4dd9aa0c..2878be77 100644
--- 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)
 {
 	word		x,y;
 	dword	time;
-	dword TimeCount = /***/clockdw;
+	dword TimeCount = *clockdw;
 	JoystickDef	*def;
 static	dword	lasttime;
 
@@ -465,7 +465,7 @@ register	word	result;
 word
 IN_GetJoyButtonsDB(word joy)
 {
-	dword TimeCount = /***/clockdw;
+	dword TimeCount = *clockdw;
 	dword	lasttime;
 	word		result1,result2;
 
@@ -1176,7 +1176,7 @@ IN_IsUserInput()
 boolean
 IN_UserInput(dword delay,boolean clear)
 {
-	dword TimeCount = /***/clockdw;
+	dword TimeCount = *clockdw;
 	dword	lasttime;
 
 	lasttime = TimeCount;
diff --git a/src/lib/16_in.h b/src/lib/16_in.h
index daa864c8..8e20760e 100644
--- a/src/lib/16_in.h
+++ b/src/lib/16_in.h
@@ -251,7 +251,7 @@ typedef	struct
 		static word		DemoOffset,DemoSize;
 #endif
 
-extern dword /*far**/ clockdw;
+extern dword far* clockdw;
 
 //	Internal routines
 extern void interrupt INL_KeyService();