From 3267427b850b84f59a555c07deec6656abdb776e Mon Sep 17 00:00:00 2001
From: sparky4 <sparky4@cock.li>
Date: Mon, 29 Jun 2015 02:24:00 -0500
Subject: [PATCH] wwww inputtest works good~ 	modified:   16.LIB 
 modified:   inputest.exe 	modified:   src/inputest.c 	modified:  
 src/lib/16_in.c 	modified:   src/lib/16_in.h

---
 16.LIB          | Bin 76800 -> 76800 bytes
 inputest.exe    | Bin 35323 -> 35323 bytes
 src/inputest.c  |   1 +
 src/lib/16_in.c |   2 --
 src/lib/16_in.h |  23 ++++++++++++++++++++++-
 5 files changed, 23 insertions(+), 3 deletions(-)

diff --git a/16.LIB b/16.LIB
index 266271d9885120353d2fc3f383cb8f9d8a046de1..56c3dbd4ad0f33c5bc1847ef8351d68543fe7d80 100644
GIT binary patch
delta 1562
zcmWlZeRR%c7{{--`~Kbc{nR<Nh*Q=ytd}#?PDxGTA<0|F%difHvo*79GS$X2O&e=3
zGRtgAhHUb>CqxN}USuh0Q=Xbyk)qNpYN@Al{c(N2=kvY3e_pwblG`ZT;u2I-L}*Zl
zvdtMCy3AS}1-U<k{`UhONSv5>cdx`bnbQ)}o=ghM$xo*DNbv<T5^f`rR(EswqElIg
z6yxu~L6c(I1!@6cD|CQ5h=d??haGS??1Wyh3*zA|7y!FrFuV;zVK0n?1MoN;gvoFS
zlHdbKfy0mnA3-*J49~+6D1xI<3ZKGqI1Ve}1Z;pW!z~T)A)E};ufy~dgu-(Hn&5Xh
z4VR!9uK3{$T!pi64W5JR@E7Qb=OGS%13$LF5WEEA@G2xCVhR$bBjX$td<G+N0d~Ps
z?245b3U;4ei&#_EkTDC>gAZqhFwhNaFb3=JHaviL;t`yN?Pxl7q8Zqg(lM4YF`lw;
z7|p{3dKObD8#5^fvuFWkQveGn7mH~jE~h-KrWdf5@^K3-#y4pR?x8~5PcPyJRE(cd
z2_C1V*g(thTPnk5D#vs5GPe3@1-4NIGFRgDyb3$=D;UYEu?xS3ckmkQ$<^44*I_?i
zkAB{OgSZxla19RUjhM)ra5~Qje*g3*USKoM;w?Cvw_+C8VGajzF~5T)ydTT?09NsP
zSjz`-6Cc7YT#t2p4EOPu_%S!&r`(7Qd=gLdS9p$3;RSBSzxYQ4`58&hqLFjxlV9*w
zX~7t2#U64Q`^pu3RFFo9&}h*##V;Ps5JSo0C{28nE;m!AL{YYMrV_c8R!TH&k}kAQ
zy3z^hPNyV}&d5D<Mee1mav!nk6P!K&E-%oVth%4tsXlaz>PxZeA&OJ|sJDuz2b7-%
zssS`y4Wn^tBqgcQG*gYIJe5ENY9bY?NmQYpph}fV)oLEqs^@5%%Aq=yO*_;A+N<VM
zy;?{O>Ulb;7SY!#pF*mDzEMl4Nfpxfs)#Q7RWY@yQo2qrrS`glI_XM^)@vzAujA=@
zJtgbSl&ZH=y52!^b$gnplWBq8NqIVj7U^A-um22AeIZ&0cGD8Qhf4H8TBZ+Cxjsx4
zx}GZa7qnV`PSyH2ZPX{|Z5^Wh`dd1zo9Ku>P4)UaI<A|kLH|Hs=^rVif2AgUiO%a*
zx~MM`dJ$;6zscvdQ3vl|iuM%8c*3!s=02XsLp{S&Jj=;`&vBM_1DAM_T;)aaTJJu7
z-MfW%dGUPI8^j^+5&qd5%;&vF`EPG1|Kkl~pBc{Anh_jnMsk!n793bqpaP>f){N$!
z=5c<|jOG3&fd`riJl;&=$>s^3Y9cVzOyN0Z8qYPU9588|XJ&G~nZ=dnDc)`}IA}8Y
zfSJojO%^wsd3?q^%jeB=++wo1&E&Ay`FxFihNEl+-(lBqoL$HF+x0xyUf^MV`v;G)
zEu3U8akBlBGwfx~wkWw)NuKqj&{`?A5wgtQDCM@Jtg<)B8XGO^Y>d>{+hwbr8!TGZ
zr~(nV)3(QVYy`d=-tXHUa@fYnNA?~$Y9Ew(+fRPA{iVhF<%%65ZFYo!drXWQCD*zL
zZ0FkJO>T^Ia$}{N8z-@Dyxi+1NN+b$;@vdq>r!NZOO;2$*%9IF7?&pFT)HH<r(~*|
zEh&DNAsOyz$#Mb7aSNr;Es}CqAXP43UUf^P+7(KTdr{tSMY7cu%XU{H2VJQgaxcjz
zu1t=(wqUoFlc@W0X>>2kDOVv)Zl#=cm2$yV$wl`{_+zh@zuar$^R1B^ebv&@H#4}o
ZYJ#Ygi%Z8wt=M)0j@;gPJyus2{s$o8uJHf>

delta 1565
zcmWN}dvwlq90%~v?fd<Gzu#xh;q+)uhnCA$I+Jp0g{U4&a%;H`>nw}Lnzf4-ZT75I
z%*>|EGS60y5r!}isU(%8a!D6$Vkiz$Ryj3Ua(e#xyx;G0UguNXBE>DTZ9ua6woB{q
z=<0WJqI(yX#z65eq0W&#Y*5P7lzS3V@^YU^$()@Qsj0KG?wXYp&Pl$Vs$;r%)nnFn
zs@{_mRb4Afv2%F%v^alo696<pH0*#LuoL>hF1QEYg9LaV2Ezw140gi^*aM?rFC@V}
z7!Ug)6%Ifed<nDQ3&@0nPymPE6*vs#@HJGzH?SOz!AfX`_0SUec08g^L{w`;oQmAj
z&;~!lpKuobhVyVO0KdQuxCBx78+67t=#Rg{0K5VLY=@C}6(%8I3Np?@!7NmmhZ^T$
z3>IN5R$?56urS;&yAg3?b#u-f%nU!8+ls;4aRc6g+p#Zxg7J6|XQH2;#qN}jeJC5_
zX)X??c{rNpV=@(B1}(r`D#Cm!#sYd77tt%YluB?py@n062pg#sw@?}Gpe6VLmE*^>
z6c11(enZRfJF3EFT8^iw2G7w7yhOFw9-x(YokGZ5k6rjJ?8d9G2d~E7+<<*~4ff}?
zn854sVP1~`Zp7id2}klq9K)M2g}2}gR^hXA4|&0@IES}kHaB5D@4!OdiKYAzR`91-
z!~3v~Kf^}ekDK`bZsDW2oxjDs+=5^6ar~Np#AZH$Kk-St#HX;0&tnH)M3Bo!atV$6
zhCXS-p3;tS@(<o69XM3}#m9wdtY{i1hMo?HrJ3R=U7{#cI#HJNpj_!m1=5Quq&KaU
zKD1e4X|Kf5G3iey<zBiV33N^FryDYmSe*=KFSy$a4kD`tlV1&`Th+r9uO6WRDnJjY
zAv8!OQlfg4#;CD0NsXg4HG!T}Q>a8ur9~=*%G6U-t5PYX=2C;2PmQXOwy7f8t`^Wv
zRZM$SkdCMlYF4k(akY?6s8VWGi|LeFLT6MtomCZdC7>#)UA<17brp5hA?mK{sh576
z()2o>q1RKo-bxudOj&vty`ZD%MLnB}^m|mIGw4<QJ}uNM!qZ>trGvX^vHp-M^nR++
z2dGAWLAClQh4c@!N`Frc`WS80&9qyerjPYc^tt|-4(hXXM4zMY^m%I57wAWQky`bi
zbVgsL%laR>qB{sZKN{~p@_9EX+C%Q;c^v0yj`s{d=vf}+IeyynaeBau;(V_wS9md8
z=k??@-auaG-Nw7TA$-^y!L8oo{Hr&TFMFf-UvCWm=Z$5bd4fBcB<^9xag2FBoLIg{
z1;=x|nZW(cL>^)$^CM;|Cz@$I**wLmCY7ffKW3OT&NDOl1(V4^lf@-w4lgv%bI9ay
zlgZ<-naiJ;7x}Q6$LGv^zF-RYvMJ=h%mTh{idbxrqwGr@V?*56uHgZ89S^kYd4&Cg
zM+fZRJi)een!U>D_8RBd4lb}P#nzJ&Yo*Nkq|*AO%65|)dyCZD?y}nUk+t>?*<kOK
zt+s2pysAY7{rIkp#t*F@KZ@jM_HOyy-YZ|)1UYOUk|Q=CzuRH*mraywcC=i#NdoRk
zF>btca(?u?XuQQulJ0J@#JXgOcT?m(H%%UJDKgm2l%Xy|hPh06EMmt->;#u3lU%kW
zyBwMBa%EP)<w=gqmwflK6uJ^Aa|@-$EtWc0DsQ<Z(%{NvgIg+_T!n0PmD1#v$v*eG
z?0402$koVES09dDIgR?gAuX;}PP&ksadmRh)k~XuQ?9sG((YDEhied@Z;jmSTPxjs
d6T|P+O%XNYk7W~MS8TfplbUXO8ygzR{s(ugu1Ej?

diff --git a/inputest.exe b/inputest.exe
index 91329f9cd34490015f1e145e40c71f670ff06541..0ac3e6a6f5e7ff5650095de2c7e42cf7eb82c557 100644
GIT binary patch
delta 22
ecmex8nd$drrVZWAjI5J;nu8cuY`)(t!v+9(Jqfu0

delta 22
ecmex8nd$drrVZWAj4YFTnu8cuZNA?u!v+9(Jqfx1

diff --git a/src/inputest.c b/src/inputest.c
index 98815cc6..5df1f39f 100644
--- a/src/inputest.c
+++ b/src/inputest.c
@@ -28,6 +28,7 @@ void
 main(int argc, char *argv[])
 {
 	player_t player[MaxPlayers];
+	//extern struct inconfig inpu;
 
 	IN_Startup();
 	IN_Default(0,&player,ctrl_Joystick);
diff --git a/src/lib/16_in.c b/src/lib/16_in.c
index 6d8c1aba..55afb211 100644
--- a/src/lib/16_in.c
+++ b/src/lib/16_in.c
@@ -60,8 +60,6 @@ struct inconfig
 	JoypadDef	JoypadDefs[MaxPads];
 } inpu;
 
-//struct inconfig in;
-
 //inpu.KbdDefs = {0x1d,0x38,/*0x47,*/0x48,/*0x49,*/0x4b,0x4d,/*0x4f,*/0x50/*,0x51*/};
 
 /*
diff --git a/src/lib/16_in.h b/src/lib/16_in.h
index 352d87b2..410831ad 100644
--- a/src/lib/16_in.h
+++ b/src/lib/16_in.h
@@ -208,13 +208,34 @@ typedef	struct
 	ControlType	Controls;
 } player_t;
 
+/*
+=============================================================================
+
+					GLOBAL VARIABLES
+
+=============================================================================
+*/
+/*extern struct inconfig
+{
+	boolean			MousePresent;
+	boolean			JoysPresent[MaxJoys];
+	boolean			JoyPadPresent[MaxPads];
+	boolean		Keyboard[NumCodes];
+	boolean		Paused;
+	char		LastASCII;
+	ScanCode	LastScan;
+
+	KeyboardDef	KbdDefs[MaxKbds];
+	JoystickDef	JoyDefs[MaxJoys];
+	JoypadDef	JoypadDefs[MaxPads];
+} inpu;*/
+
 #ifdef DEMO0
 		static Demo		DemoMode = demo_Off;
 		static byte /*_seg*/	*DemoBuffer;
 		static word		DemoOffset,DemoSize;
 #endif
 
-//extern struct inconfig in;
 extern dword far* clockdw;
 
 //	Internal routines
-- 
2.39.2