From 54b9e15f1e29c85e1174e103dc43ca6aaa59fbab Mon Sep 17 00:00:00 2001 From: sparky4 Date: Sun, 28 Jun 2015 01:06:00 -0500 Subject: [PATCH] wwww 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 74752 -> 74752 bytes inputest.exe | Bin 35538 -> 35543 bytes src/inputest.c | 2 +- src/lib/16_in.c | 12 ++++++------ src/lib/16_in.h | 10 ++++++---- 5 files changed, 13 insertions(+), 11 deletions(-) diff --git a/16.LIB b/16.LIB index 0cafbb6203f2fd5b31d95b56b8df5ac9d830c3f7..3544d58ffb6913fb1d8070c527c4c9b819ff23a5 100644 GIT binary patch delta 5006 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 N1k8GOUIM!1{{UATidO&t diff --git a/inputest.exe b/inputest.exe index bc2720974a667a700f2cb428eb21442cbcff94cc..db576b8436a593aa203dd831f5caa25d98f11b25 100644 GIT binary patch delta 3478 zcmZuz4OEm>8oqbFZ@!stY!IUyh@Sy}!tswm3boRO0CfaWMEt2dG{AgH5F^9T3JMIO zHE0y}YIWK)EZN#Jw)6yHFY=FJX`i->~p^%bI)n!@bKK{eeZkU z_kQoa-+Z*uaD1bo^#LxeFMGh*BlB||?7RH||BZpO4Z$nUubR7^SAwgZ^0}v2+d=vH zZaLWF{3;mMB{z2m!w!;>C-4K5$j1Wb@sWcM$jmPVF2t|?)Gr6)Iy-_~mbpYN#!OO>tO8)eMvFRs6mAU(o zcV(7w;quqJu68RhExxz&XSltv2NUuZfV~}H&V75G^7CEt^PTd7IMdowN6%e;C8GE8 z%Y};z7tw8|EG$`TYBTPa15MOQ&4k(?vB64jLPSt55>J@eRtzB}+9T^T-v4x$%7oBqOSDSG4 zSW=B$B9)Fd%eS}lIYep0`M+paS|Y!X`qC1OT^WqE)1dU>yp)pC6OAKgGA7ZM$q`hM z9?lb~0a^+)pU}c56om8na@gAMpQZj&0(P(s9JNHY3Mf<*b&6m_BW%oS@gO7+!+g zv_1gmoyen0N7Q{prp1|2(jK{wCT0&)3`W$cQDJtrX(VW*QKQ$hqYMujsXsdsZ5o*q zkCvF66PNm)yy3TcI1}}x=V!QFD5z7OfeZ!;3YqeY-4(EOQA^GQ`aEY)?t$y4Gky9% z)!p)!*Kh4_+i~!E17~yG)m5Gn1nrSGP+L~C+N*~Q@};EC8qb%|q*)0wH4|g&*i^2i zfINpU(>!3i*<`MjfPBc3xi%Z*1inmL1ok}}#FmJMCQZBew1USe`uzNv1mNw^R zSVKWdM3nMR=$qW3d<+?94@XaLy_ zDacD`$(%9PVkl*Dv##u+=jNo_c0+kW-Y#qJfV9ioLi3IE{hYh3@*u|EmTyMy1o>)8 z%kx>ApbR&*=*n5zo0nrd1EtM)(x{yVISHb#KY@nL9i5PT0}3@3D4G)_Oo>ypBoLbt ztAuKLj2@huWov;}sI(~BqaZCHdW4hIJ9kXN2}m21Hx%sykWI=ag=wFFy{x<(@=B$f z^T$oHS${nWhdGXcieV35>h+dEE)z!WcEE1sT}%q{D&Z~8jge~eV{OVl<+Q>KtqGbB zh6Bn!bf-hKJ>SWHq`v(7ly>N&eUv_LM#hhzsl3L$ytIlLCJqY?OGK0tUXjpWL7q%XL8`L}isl^5*bvjRCT%3h zc+(7%HUeY@2#iUfIi?m+O!}J23$hzT=x|;M!?gt}nlRGN0$wu}s@g{&hfRmg+TTDv zGjX%F2jslzyoh)Zbd-6DnQ2GCa?OWDM}G!-%*<4#odJtes<| z_xLGw{$17#7|K;2yn=i^HOx=5wnC{<*XYVAIz0bwYaf(#>QlN>Nzn^NFIhH(vCZmt zs^$S{S5K?jG>~oTUR6s5*`e-00$E^h2q_cf9rYcNiB9=Uxf?E@ILHb2avuN8uRLhMPro9Pfx7bk$vJR)q3({?aaoxHs^%gA*R8_ zbeC2L2X+Bhh=JA9*oV>@cA!l%ycK?*w|rjBGEafH_r8Vp+ofwo2a1t?&n99p(_2&J zFD)+1aF>@B`P_cYcpCD+rTGDtVw+f$S8@jX;p>|smsbZ2>SrLul7Jgn&+KZ2we zp=;Nw^!M2}HyCkTLr<}K8BFZ#z}WBh`Ky<)2{>giXL>Yub-ABC78>R+t@f9A|5(9J z4vam1tU5!Sv{al7OvotrxP8#7GKJeA^e4o*9(PITSg>UDlu#Ok6xs#$bx1=)UAHex zG#oq^xJ&)hydor9|9?v81$8Q47ps3h`tDz%Rn_D#vcUM2R{7jLY@TGckBpCukBy9!RGXyyA>JiD zyE0KaOJA-TVf=VSlJqJKdief~+TG2S>}3b(#phQjG>K3 zWR^4V<5vf7gcO7p-xs`&v|Vpvg2=abP55+YNZ#2k=Y%$9$gJg>pEVi7e&C12_t6~& zCzf1k=+Fmce^w7!jTx4ptoLUP(J|kh{;VL~XUtH7vLx&lV=E8R7}K8gki5Rj_j5=I zVM%Spj_yIytr4+yhe)c=7FDmBX512z!|CX7Fp5VQ47_NU1HZ;Zs>eK09}=x}c9?&- zlNS(WC-Sf8V0IE;NS|jX>AP|m+f6q)61kf)97%fXEXE|-ad#wDJBINDY6eROs};=B zATy?8;-^zqb-wGU)5S4K`jV@F)1QTKzK}C^Oj9K=ex?PJXqliUMkV^1yTGe?Qq7(KTGYL zPUgo*|B_Bqk#n4UO**Zkx13|7>i}M7wCM%_V*$RBzHmB{=b~-35fa5FF;#3L6Mx$8 zA0xz$&T2cl(3v-Vzbtm7=w3q7^s^AogQ#>&Q|#znipw9z&(a_A6AVm`_T75w%bk^w z2p^+&L;qj@Oy|>!{$so3bN{==och`vuUqW!C<0{dUZT0qu@jHU?O1-W zCT9h%I-jFBCod0Ey5*T@`*)$@a#uAXA$p+TcItHwm3riM@jPt3zb{kds;~37k=dv5 z09VOUn9e;kxzIMtZD4E@%i`(;nCJ1w)N;7P>~5}>!Mw*NaJ3NT6Z|o?6z(T>6KARm zE|yQg0T90c-$gGL+ATXlALCDh2KWuSP&g&_Ly%tHh-X_Zta=@?o4>AQxF~D(^teez zEu#i0Rl=)FAwAr!z0*|MIXma(a1pntQWf?tx2wiivBCqgOguC-g-ml2vaew3Ufnqz zQ<;geOS<6_Q_XNzX)fGIxP_7*E*Y*(dQ(!9V0OcVHxZ!9Idd%=!A?ovfCc#X)Hi2d z^miaPB)hDB3llA;;;0~&O1Br?W=S#QV8||@057A;qFXI4kV?5#BZp{Lkt6yIkSFEW zWc78J7vxvM^Ch}gG})rNiLp22Q8-KizLs+5)>>LX67_8w>8Ie_g6In%9r`nR^*qcO z7;Sw!-7+uLmN5hy)t4x0I!uHTr>JQ#(Mqfm-qU7UKF=Aw32cedrl^m>w83Z`)UNDP)Z;MQmF)^sKZJW(c{!YQ2aPUHn>5OTXRY0g;~aOxfMG9x$m^{Ht`tEv z6LMHNf=L0sTx5&OB-5JW*l4*+=~tL;i%qRT;FxkwOX{P&#dcit^TqcoyTDUx$T@#z z&Q;inywTNAQO9(5C4`6Widv?dlpro0&L8elowqixTJwWz|4d}Fb%fA&<2Z1Us6p;ezPb& zjC&FI?*i2=7^(e`J%%MF^(4%3!*Qc}80PN=Zd4D!TsB-56}w@RjZ=(FeGhK7@whnR zXJAhmaYoe(aB-$MoGUCiZP>3*O~OIRo4usis4~?eE5M(ibqlgBkApOt zHfZECI=Nt)9HG$y%EFVD)guo-F3c;Yw@qpW%wE%8G>`+g zPoQZqhfIe=Cu$jd&~(hCx-=6ssY?e9qD)?wMbwC_@?OCYO=4$M(*+zk>e6^ z%6|KZW(|(C@8&}4SP^y4KA^$R<8j!$*#%4TJ&nbl+7%V$9;V{;6?*aUWH;dOHfDHy zv%HOtvN{%^?^Z-LOSp~UmsDSa0P7zd`&_lY`Wj}(B|oOmUI!z`@6aoGOp27OXB;r1jzW0nYQd+~HHtGH_%B86uFk+E?qXVqenM zM@BV^^MgpKtHL+kD@w2@en-OpntT>!j`GTBuJTIe#cRSO4B3IO&8sV^^Wb*X)caTj z-T|V&fvsV%yi9xOLUqg)&DcAf(fEc|zMB5hkiuQ`Nkc63r-m7PGfi#Gv zG&MonX*=`?y#>8UXIG~1Wn@@2#qx_yto}@-sQhQG^5g_TvPTLsLJ+=`HmtJp$LIy* zXC{j1H-k~J?jn*_r|@qn4eF%Q)mC0fk3d7T4f;JDgpQ?;5G^O(WaS-XgPtHqQwl## zmGHx8Q&Wm%YLckjA0yUXs&(>=Mx3Js3HR2ekpYcVX}$fEMy;`029m|x1LH;JWsOHt z3Hbdff{#fRJVvY8rjgq<5}{=tru}QI{2HA`ej~W78<{ThEn5B#jo36YR3qIQv1{a3 zt-=76G+Xh%tor5@{xv-he;d6GT|l2h*U&G}y=3)U`5Bt(&ooR;6RTXO95d@^ghT4y4I4(cTmRK6h4X; zt+nzg)ChIcAE8gu8{lR-4}F>}>qHM}&@og9T}sQKo2d=jL$5-|(}{J}d>c((@8rSG zwd@0rEe Fe*mO=kO%+( diff --git a/src/inputest.c b/src/inputest.c index 8d94fcd3..76265e73 100644 --- a/src/inputest.c +++ b/src/inputest.c @@ -30,7 +30,7 @@ main(int argc, char *argv[]) ControlInfo control; extern boolean Keyboard[NumCodes]; IN_Startup(); - IN_Default(0,ctrl_Keyboard); + IN_Default(0,ctrl_Joystick); while(!IN_qb(sc_Escape)) { IN_ReadControl(0,&control); diff --git a/src/lib/16_in.c b/src/lib/16_in.c index e3832dcf..c8fd6266 100644 --- 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 7cc14372..542f6e29 100644 --- a/src/lib/16_in.h +++ b/src/lib/16_in.h @@ -19,13 +19,15 @@ // // ID Engine // ID_IN.h - Header file for Input Manager -// v1.0d1 -// By Jason Blochowiak +// v1.0d1w +// By Jason Blochowiak +// Open Watcom port by sparky4 // #ifndef __16_IN__ #define __16_IN__ - + +#include #include "src/lib/lib_head.h" //#include "src/lib/16_us.h" @@ -291,7 +293,7 @@ static Direction DirTable[] = // Quick lookup for total direction static void (*INL_KeyHook)(void); static void interrupt (*OldKeyVect)(void); -static char *ParmStrings[] = {"nojoys","nomouse",nil}; +static char *ParmStringsIN[] = {"nojoys","nomouse",nil}; // Function prototypes #define IN_KeyDown(code) (Keyboard[(code)]) -- 2.39.2