From 634cab2f93fbfecbfd035e1aadd6b396c5ad73a6 Mon Sep 17 00:00:00 2001 From: sparky4 Date: Sun, 12 Jul 2015 13:22:39 -0500 Subject: [PATCH] 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 --- 16.exe | Bin 53610 -> 53604 bytes exmmtest.exe | Bin 46152 -> 46146 bytes inputest.exe | Bin 41932 -> 41933 bytes maptest.exe | Bin 53029 -> 53023 bytes src/inputest.c | 5 +++-- src/lib/16_head.h | 3 ++- src/lib/16_in.c | 6 +++--- src/lib/16_in.h | 2 +- 8 files changed, 9 insertions(+), 7 deletions(-) diff --git a/16.exe b/16.exe index d407dac141d591d9fa2508db9ccc8bcbbb848d09..30dfc54d2380e82549fcb96a43a9ebc765176e14 100644 GIT binary patch delta 1962 zcmZ9MZA?^06o%*A{j%c93TnlVUc{vIE{Y;b0NDVE25cqPMr*Wb5Mgim+=bm0f>yC< zZ1jggJobmJ+G1L(ZEds^6%bKZDKM7&JWiCEh=4cuy>(97k$KyV0*vLLMzOu5f69-!y|>L}aK4S*Ija zQBav55(CKK(qtL;H?r2K=d~7LjMFSB_vQ{4_^+U3%ZGYEO@0t^C%lDVmnKuVE%HqM zmuIL2xh5!kZsF`T33VMRUWRrNI#FjZGExnz)L^u{>KE=rZrAKV&=cXcn#*CF@%oWQO$u7WZ))ZBTBFo4nb|Ff9g#lr)EVX+0VD;p>#h5p%AwAY!t1#uC!9#17-P{5*);89LUBFGW zrP<6~FtN5+pnY&@Kv;Sh(qL-omL%Y-i4~mLoJgrnzUBgrGP&od zP8;~~(akX{9GKQtA#WI!k_V@6D7teky32`4G1@C?mv;ND{fh56Yro$m9L zmK++--j-zA$vazg@D}KO?t@11Ao#aDqgAJL&TBR3JFaQ9tO5$a027SSGZ94tNpTTeBbMU=LH%1=&~@x<9}(X^VQ+YP$Qo_3w0`CVu(uZM2t-OwMn9eRteLtXp~ zkvlm4gien*=Y&CXxC%bZ4bX>t7&@0PLi71g=pG)^q0>*C)M3ydzXQLN*FoRsPoev{ z4SJjVp^5wyTF#SB8qV)iWw)Ca$PQE09nY2rh*^1m!WP&7A$eT{- zIK(ec8T2(@fFIyT(6t^vv(f0dvpUuD+_TB#;1c*u-U1Er0q6lf2ff7ipp*EePI-q0bZgVX&YN~l?#^(y UB1Lk$+wor(F0g%%Wx&QzG delta 1932 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 AA^-pY delta 1169 zcmX}pYfPI}7zgn4yj%)yKnHT^pnC;1?d!4uDZvXVhd6NnDnFSn4HejA6zPWM1MHG5UX(xPJKM|32rO z=j1&7{JOS$U7P#Cw=tNm{{L;n*t7S+erR15kkfRpcv0Qtk}w+SI{N7;Owl4-X>w(3 z_9|uPi2~T0?eajfy!lv3ZV|g_YD}Y%(bm=qvl=Xm8M^b3eQDN1kk^-y^E%h&+-tmgP)bnV zx63)tie0l@md;2x(ALt)gF$F7L;DhaeZ>XE)?a8u4bz(be&c<^EKDZ)vh)p``O+gz zfrttVN_$GTSmSK)M;;CP{kI2c4aE!u{hiiSkK>OI=J?v!h)3>0YQ)HT%&Anm_G{VO zGbQC6xAS@#Z&G_K?)>&LX)1w7q78BtC!-#D8lOgWIf?J-3jU>kK_AuSe(a=P_(l!6 zh7+Up62KBGlUSu+!#1YN2Ds=BG|+d@LN8)q%#d8nGgspZHF1NU#-?#yK0`Il#*?%b z9rSq&j~gd2X%rZG=zRu)-f|_*g}=oz_%kh?T``t$hsCWa>pIfl9^kK9B%a}|bYBhJ&;aGA!jMpuwGt;-EmQYZG)7tl^8Ff?sQDHfT1NYOFe lqTj+Xql*gnVem1%_8h+Kwd1`u!HHAaxk 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 JNbhD7@;|_WV%q=! delta 13427 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 diff --git a/maptest.exe b/maptest.exe index ed045368a4287c97ed7f59fe3d316b18717c5432..f634cd39355a77c0d456f5ffcdab5f9d2cee8146 100644 GIT binary patch delta 1784 zcmYk73v5$m6vw}F``|IkItv@qZ5IZ*-3>wQGT5UGVvHk58VJcGWWu)gvS-`TZeuYr zi5fwKF%DozcqTdwhF1#dx>xC#kwUtE4^I_j~D(4|z7B%xju$!m(vuFh`1WUQmpJiFR zN{C6kpw7X^{C27c$NigW;&&Dy6u|ud4I32$Lyb zzJsU@se`FowGQeo-Nh@{4?<2>HktHo5QmgQiqLmMSxr`x&^w{ZOl7F9_dp&nm6-Kz zh-`B8f$=Cn39_Vs39s%5%G=yIH0maSHOBZSA|fprk7*0Rx}?}i9i0){XTD_ zD8+Mlni>K^PHVlt!eiV3j^yI2h-LhHcosQ1^F$%74VRxds?ajFMN(irAJJ$nyTLYY zjkqX@BN3H~_-f>J(pl|t+J4R!!mLb4lpU1tNYpXbp-E>^BEQu)#a3i2EOxnF%}Y)@ zXeEccoXX!C|J0R1AMu!|W_y$)PfVR6gYIxgw}WQzlBh}^ZUnb*2lyo)k7_iRuOoi- zOc_5TUBc|c=vHl$W=RW^C3aYI zWYCz7+0yCfq*yBT@Q>Xp{lJzUjcR#zk4ih(4W45^IG)?Vd_D?#_!78{e???6r}nBe zj|+OWX}4aH*$T2`6Gu?x>E{JVMHKOSy&4|yFnEQp;#?))2S4VNK9#=VIen_~D39Ol z%fR257Fad>3E06Au#c~T5BNU#DyQ_Tw4UemYxEUYK#%ZxFqIF03pft0=3!80ifMF& zb7Ly~!i!>B!ny+45}DIpE^}rY12&zLPCID>zjj)s z6YPba$-AIE90hmrHSi)o1n+U`ph{_60G9G{a0|DBU-K?daC8vUAHF^Ku9fT07mu+g T3TMJXN4WF++a~kvRYLp&zw`9L delta 1751 zcmYk54@}f$7{}k|z2BXGkah@&H1eld>K*CAD^i9EVkwzyX%5p7oN_<8gX0eF#91b` z>B>3s&x6x4v~<-{nXfOR>9m<2fn7W$FrD0702Xp}V7hfh zsSrt=SCPo40(M#-i3RE@{%5NYQm_DRzw(;u+ZMaL!}DtD$4zP+LBX`jQiOSRNP;Xs8Dwn~kbP)VrPv~3q)$I;qNVUJjcHM{%~hBM!S{7+<2nLF%O?cRZzMH{_k;c_9LPgl9J zsNCaSUmg}RYxq6ruJnYFN6txKH?$#O7$FZLa?A)-#~b#$gC$`xfDCr2$~c=tPL3xE|~Eu zw1?1%c?V;YIj}*mQ-?CX!^#r+N;8Tfim8}{u^lQz56K8ZG*APqx1c(y6KWgO01e<9 z7)_ALa;L>O0C7wnlfpOxWwY2U!Z-m{WGO;*BL?}YWr1dNLCnx*fW|dVB#Y%*L^JyE z+Nd>xYM6fE^jcSv`bNX;4o^t3#_rGry2V>-Q!xi0)uwq@VlIu%z+~%Gt1#4<&a>{e z8M`3LtYxs8pnTRHR^tdn&>Dnw0%`{=Y;6H`5sHvGUUOfY0z!u#hXjFz*CE=HuWMzI;xXl*_-J zn?w$d>vquxyr5gBHZJLQ&77U5QWqDi@-JhKN1ilDDSYPo(KnUfs4h4Du<7KMC}*ST z^qEeJ>5Mm>ho*DUbf%b2`a)Ibp6QG;okG)jU^@6D(ZtaWrn8`ww{}g8|K5B_!t}mo gn`YjNjU(srkBIzqeyfcyU3xvzeA#Ew?v@JiFUY>?SO5S3 diff --git a/src/inputest.c b/src/inputest.c index 5df1f39f..6fdf5567 100644 --- a/src/inputest.c +++ b/src/inputest.c @@ -23,7 +23,7 @@ input test */ #include "src/lib/16_in.h" - + void main(int argc, char *argv[]) { @@ -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)); + //printf("%u\n", IN_qb(sc_Escape)); + 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 19e713b1..2bb380fe 100644 --- 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 2878be77..4dd9aa0c 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 9a9c7685..fe621bc7 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(); -- 2.39.5