From 397c4629f65e02f14821d0212860c44abfd037e3 Mon Sep 17 00:00:00 2001 From: sparky4 Date: Tue, 15 Sep 2015 14:52:58 -0500 Subject: [PATCH] i think this may work now wwww modified: 16.exe modified: DEBUG.16W modified: HEAP.16W modified: MMDUMP.16W modified: bakapi.exe modified: bcexmm.prj modified: exmmtest.exe modified: exmmtest.map modified: fmemtest.exe modified: fontgfx.exe modified: fonttest.exe modified: inputest.exe modified: makefile modified: maptest.exe modified: palettec.exe modified: pcxtest.exe modified: scroll.exe modified: src/lib/scroll16.c modified: src/lib/scroll16.h modified: src/scroll.c modified: test.exe modified: test2.exe modified: vgmtest.exe --- 16.exe | Bin 38352 -> 38352 bytes DEBUG.16W | 18 +++++++++--------- HEAP.16W | 30 +++++++++++++++--------------- MMDUMP.16W | Bin 75 -> 50 bytes bakapi.exe | Bin 33326 -> 33326 bytes bcexmm.prj | Bin 7047 -> 7047 bytes exmmtest.exe | Bin 41164 -> 41164 bytes exmmtest.map | 10 +++++----- fmemtest.exe | Bin 12948 -> 12948 bytes fontgfx.exe | Bin 26298 -> 26298 bytes fonttest.exe | Bin 13608 -> 13608 bytes inputest.exe | Bin 23372 -> 23372 bytes makefile | 2 +- maptest.exe | Bin 30710 -> 30710 bytes palettec.exe | Bin 24094 -> 24094 bytes pcxtest.exe | Bin 34570 -> 34570 bytes scroll.exe | Bin 47870 -> 49166 bytes src/lib/scroll16.c | 6 +++--- src/lib/scroll16.h | 4 ++-- src/scroll.c | 16 +++++++++------- test.exe | Bin 24382 -> 24382 bytes test2.exe | Bin 26240 -> 26240 bytes vgmtest.exe | Bin 30630 -> 30630 bytes 23 files changed, 44 insertions(+), 42 deletions(-) diff --git a/16.exe b/16.exe index f209afe55a5e858d8217a8488c7008509a8e893b..f0ad88163c2ab674bfa632953dcb239f433480b4 100755 GIT binary patch delta 29 lcmcbxn(4x7CL!Ob3yj_jTNw)&TzLQg-^j^uVx!Q$sQ|3D3*7(! delta 29 lcmcbxn(4x7CL!Ob3yj_jTNw)&viSf1-^iKpYNOD;sQ|Hl42J*! diff --git a/DEBUG.16W b/DEBUG.16W index 3d63e4ce..e1f47b45 100755 --- a/DEBUG.16W +++ b/DEBUG.16W @@ -1,15 +1,15 @@ -Seg:0 Size:6855 Owner:0x6c63 -++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++_ -0000 -Seg:1b88 Size:40 Owner:0x0 -+_ +Seg:0 Size:6305 Owner:0x0 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++_ +0 +Seg:18a1 Size:256 Owner:0x8d1c ++++++_  -Seg:1bb0 Size:256 Owner:0xaf7c +Seg:19a1 Size:273 Owner:0xcd8c ++++_  -Seg:1cb0 Size:273 Owner:0xefec -+++++_ -000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000 +Seg:1b88 Size:40 Owner:0x0 ++_ +00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000 Seg:abb0 Size:13392 Owner:0x0 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++_  diff --git a/HEAP.16W b/HEAP.16W index 60b00efc..c554a642 100755 --- a/HEAP.16W +++ b/HEAP.16W @@ -10,15 +10,15 @@ OK - end of heap == near == - USED block at ba9f016 of size 12 - USED block at ba9f022 of size 294 - USED block at ba9f148 of size 42 - USED block at ba9f172 of size 20 - USED block at ba9f186 of size 20 - USED block at ba9f19a of size 20 - USED block at ba9f1ae of size 20 - USED block at ba9f1c2 of size 20 - USED block at ba9f1d6 of size 3622 + USED block at ba9cdb6 of size 12 + USED block at ba9cdc2 of size 294 + USED block at ba9cee8 of size 42 + USED block at ba9cf12 of size 20 + USED block at ba9cf26 of size 20 + USED block at ba9cf3a of size 20 + USED block at ba9cf4e of size 20 + USED block at ba9cf62 of size 20 + USED block at ba9cf76 of size 12422 OK - end of heap == far == @@ -33,13 +33,13 @@ OK - end of heap Memory Type Total Used Free ---------------- -------- -------- -------- Default 8166 222 7944 -Near 4070 448 3622 +Near 12870 448 12422 Far 8166 222 7944 ---------------- -------- -------- -------- -coreleft = 3620 -farcoreleft = 19560 +coreleft = 12420 +farcoreleft = 28360 GetFreeSize = 15960 -GetNearFreeSize = 3622 +GetNearFreeSize = 12422 GetFarFreeSize = 15960 -memavl = 3620 -stackavail = 42358 +memavl = 12420 +stackavail = 33558 diff --git a/MMDUMP.16W b/MMDUMP.16W index 30b072b875fa0242773c981f6bd38a8b67898308..3ba611a41d0c318a8c2f63c3b4899a7c610d6df8 100755 GIT binary patch literal 50 qcmXr0FfcGmv9d@pOjgj)WzbZxRWP!&Fy-YkfJh{#Sb!u15fT6y>I!H8 literal 75 zcmXr0FfcGlwlYgLGgi>hJ+7%>t6*elVam&80F*FFu}VxcPXE!iNQk(xub}<3~T$C5v diff --git a/exmmtest.exe b/exmmtest.exe index 1543a68981b370d9334d02534e7571b0b2a9ac8b..9013501f50ad5de14ca3e42e085e33e6905610b0 100755 GIT binary patch delta 29 lcmX?ekm<}pCL!ObGYo+Yj~J{Ort|#&|ALd@#73cA3jnp?42b{$ delta 29 lcmX?ekm<}pCL!ObGYo+Yj~J{O_VWGz|AI5&)kdLR3jn&P4Kn}$ diff --git a/exmmtest.map b/exmmtest.map index edb26c8d..26cf9243 100755 --- a/exmmtest.map +++ b/exmmtest.map @@ -1,7 +1,7 @@ Open Watcom Linker Version 2.0 beta Sep 14 2015 12:40:28 (32-bit) Copyright (c) 2002-2015 The Open Watcom Contributors. All Rights Reserved. Portions Copyright (c) 1985-2002 Sybase, Inc. All Rights Reserved. -Created on: 15/09/15 11:25:52 +Created on: 15/09/15 14:51:44 Executable Image: exmmtest.exe creating a DOS executable @@ -13,7 +13,7 @@ creating a DOS executable Group Address Size ===== ======= ==== -DGROUP 098e:0000 0000f000 +DGROUP 098e:0000 0000cda0 @@ -41,7 +41,7 @@ YIE DATA DGROUP 09d1:000c 00000000 STRINGS DATA DGROUP 09d1:000c 00000000 DATA DATA DGROUP 09d1:000c 00000000 _BSS BSS DGROUP 09d2:0000 00000153 -STACK STACK DGROUP 09e8:0000 0000ea60 +STACK STACK DGROUP 09e8:0000 0000c800 +----------------+ @@ -487,7 +487,7 @@ Module: /dos/fdos/watcom2/lib286/dos/clibc.lib(bexpand.c) | Linker Statistics | +-----------------------+ -Stack size: ea60 (60000.) -Memory size: 000188e0 (100576.) +Stack size: c800 (51200.) +Memory size: 00016680 (91776.) Entry point address: 0000:51da Link time: 00:00.00 diff --git a/fmemtest.exe b/fmemtest.exe index cdc38ac9e4b5f90cd573e7b461b9efae42d4bdf8..748b7ca4e799c94fe701ed493d6ec8e0042bcd2d 100755 GIT binary patch delta 27 jcmbP|Iwe)eH);xl6hjGvJi}z3|Nmu~8BS~zYBB-Mj_uQIR*oU)eO1}D!l*yN3b!R*eJvk2LOv02^atX delta 29 lcmbQYhjHE>Mj_uQIR*oU)eO1}Ui|<6N3bQl+9<>m2LO-Y3BmvX diff --git a/pcxtest.exe b/pcxtest.exe index c7168bb11c9590934a1d3693db09e2b81f9b4ce9..0f0401ea1549a7eef4d0c55161c7ad923cb2bda2 100755 GIT binary patch delta 29 kcmeC`W9sT-67r4WVsv4+#bC+c!~6d~Gbh7|jY2=#0D?&gyZ`_I delta 29 kcmeC`W9sT-67r4WVsv4+#bC)$#Q*<4GiSo9jY2=#0EZC@W&i*H diff --git a/scroll.exe b/scroll.exe index 6474ed28f8ee2abed319271ac1029a0d65bc07c7..174fc9a8b3830dba5bb0d85d29f92256aba71f45 100755 GIT binary patch delta 11508 zcmb`N3s_Xu`v2FS%Z8cF%$OG(1xGBMR7x3A6oC=cpiB)>!7F4JLi3mhXP{&1KqJa# zkE6LgTE9BwINgr*OB3rEFX0FZN?D+tLO7*qmyKgaYG`Q8@4NPZQs?>o|Ihz<{xi>K zU*7euwcfSXyWX|-p6UEm;Vw}+rq9=t#pFBYd6K6K2A_-|#|aslM@S3_ecpJ1kb|JN zlaTYE6C|!9WCqv{Jm6#SVi_St>j|j_>J5a%fo!l0JPQQi0q4O_U{X0De<>#pvJDrX zf`5Ym(D8&=z)X-2R)fET-JlM90lo*Mf{=kA9!vn)pcXU>giLo4vIG1Ku7e;LxDn-m zNt+1S3U+}nH#rEoh>Kg`jm?Bidy$a7TVRApNZxCNoCPtj6Eb24S_}%fdaWDhv*2gY z%R`72%m-V+4)76Z1U~`wPC}BwQ{WxY$4iJAq=D&Ri35k{>BZYH1hj*HyhF%}e-a{s zMsN|N>>^|X_yW9@LdXx`3J8KhRzgOChrt@K6`Tk6Pb4G@2%tW^Ui%q11-=B$;2YpL zkHZh(BDf5$fOgOUI)Oq{uVsN2=s|A~2?hcaxEq+kNH7Y-g9I=ESV1c)Pe>)?=p^{T zWc2cbghWq;QI8O^?-7iD{&YfI;L90=40sf+1Yczmat)YfWBh@24k6{)gtW{>Yv*AM z7ZKvmC8RQskcp4MVHXop2E@k+IRqk~fbW3s!Q!XjnBXD^f?;Xz05=F0!+_@q zDF!e74P}B4R}pdo{0h|16Y|0u^oCr@)t>8GHlIgCD>}a2Z?yj&>Y6KqpXOyjh?Hde9q0 zf`PyU?gnNs5{v@zAOTDORxk;qgQ;K!$O745KF9@+gM6?QEC+?*^$u+jE>?lH;03TA zQ~)>F0=9ww0B2aE$#!2%1q zyBHVcz#oq}3!Zxb8Ns$OnCIXJa0T2q7DEL3CEyv`&@GDS_ zCuA&`4CVnl*aTt{5$GH^L`{Gib}x*PM~d^aJPU>SIII9d#} zBM`m7D_|#BJrb1zV=RUNOuG+JkcA(Bz2GBo091i$Pz&n8XW$h05;TKvzEqDQ}2Nl2#wt#Kmzrbr?CwL3&0%A0bwWn?fqJc4OWf6F?@><3(5l0UyZHl^x0dr9?KWu1GJ=f(C}p-Q+wP;W~qgsddu$NDMQE6NBq;j>WabkGo919=#+P zm2#;`cH7+*AzUYY=Nt{#X{-r^gk zN{`Gc?byt$xh6eNE4Q4&SoR{<6TaY5lh9-K0Z!{JPGRfqv>xZwcFy6n*5j-S>Lt#n zAkuVNR&UvY&}hh=B2M%viDc=ScDuuhC(>EduV-3vcV{k`=o>(!-x5*g&_9<@6*?O_FwWIR`gU1iQ@N=hcSgJ=<$F;}Q)3d$5r`iE|^`GRnowqAbPL>{t z*ZU?hnbN_z&Z8>5?*Pfv`)s&>cW$W4qv5opg2mx_UkSupyTxostkuK&GNm^#c4 zn}P{`PLCnUl$Jo|=oVH(I2!rq^iVts*<2{5^^ny zLncAC1+rgqZX4rBI0fP75Pp3}m~acS?Wp8L4_O0bgCP4b2hEV1-or%`dbnsbT-3mS z!kn(i2*!Pf-Wrb59Wm+dgKqV9S`an4oXnHs7Nv%gs1JEO#RVse>*m0?59D41yR+j}N5QR0xHV{yzGngEG==mR)b z4=unkcGwum9~%~hlt0;u!PmQ2fHYbaFHe5t+VsG%!2^ zlf!vb8)%ZIW$-ob=HR%Q7^5B<$r*?mhya0)^uC90%f-@rMNL$9IpUzzkeK=87=6Yg2ERmMM)+hY`}<=^+#JzOQbV zUAbkri5*_V)+8NW86A7n6bf&1uQw&J*R;jqu7)JGh_xvO*XZZ_s)mbAqmn1ka4e+X zNMcvBMNbO)RczS_+Y)M2y`=?aweb*1$5Q#4GQa&%{tACwIy(uMUmvI!XN-%#3}8}o1FQn}#~#zT<04vWHN4~bMOr?hp(TZ&SeY=sfVjW@D`EC2@-lJtFYY6NvxjDhEE=g!#sOw&s z=IV)Uctv`rT(_KQLkUSvD?FY&zxb$}(P?eh5t~mH6WHfjp~na|LLG*Nl<{=FxbT(a zRmIzHD_8Cr7suckg09v(SWy~3Ok1x#jYgH$^fie66H9y3G$H+3EIZ90 ziLt%9#9m0#+r1EepV$~G$BJ^QCZydZB_a-WIvuuiYH=M^iZ6)O$PxV zc||9hlgtLHi+jP;rW5p#El8TF?Q3W}XE`;Z>0rJ1QIaEMR~g6)aau>FV#;wp5{#W=o5=LnoG`L~#;k?FYM44Hh6mA|y8=GGiuoMzR?z8UIa0pP&|kKKGVk%X-M1LEHu*HjPXIrd^yFZB~p0X%q+T6>?h1&mEPS% zH_1E03~)+!bxy^(#@4Iv_BnBNSKh|_4)F`?vS?bq(~2hA@3pk^MeWE6Pl4?4EuFY< z;`6!*y(dgdo|Y^m@4#35ZsO$miDf~o=HHOkxeC6f@j~N;5#5uiv?kn8k)eW%*ERkq zV4Be3XkE%wWT@{*?3XJt6!g~lu}Yp38OrWEu{3oUENc9bj)a^V3*At0vH%KE;@7Df zO#U89%%qA8rpKIiqUB;(S`j?6@kh)DKXcVAl%;A!SK7psuAH~6Qv@qQ20(=xZ2t)@ zpaykWFrv%&?)nGbdo748YHAfatA`n{-)?$H_u)yan9<_VNtt20wN-n<_t%S2lZWV$ z1v6CGu!j}4?`6fQlka|0WMRK=yzgY*#9KCpDZ%5rJ9R za(ams+3XAD>(FS9u(Vj{U}7W>VI)7BJpLJaBP-h82o)M;i2F`T4FxEb+v(QmTLN<-2S|OXL zcO9CNekXWoADoQ&5b7G0KIH7wj!Ylg`AF;BSy|=SEb^z}^iXQ9L(ryA^kD`YU32Ec zYQ7<^0iND<7s`v7VnE&=z9AqZjUjBP3OrQG^NQdje)?bv7RM2%-A#=b5KH(CnTU_q z_zhVGad7%LB)OaRgx9jO4f4-Z#F$)aTtUGyx+@sekShX007|G`tJsXY70 zB2`GihNK@nML0^H=QR9hRDG4EGADC3GZhaMEw{`SSc``rFW*pLNOlyDN}gDxuEq7l z$?2sxiL&sVufTvFlm4N8l(Ytp@y(K`#>~&lowukOkJ0Ecnp6CB=3`8nn4R@7lPd1W z8ir$SRz8mR&q~4ZnORYIJBnxUOq3>Wnl$QgqdW+UMu_$lpoD@0BmH$1|TM?a_Dda{-`?*k#u!G2PHI(CQsyJw#oMSyF=V(b2C(qlC{%M)_ z#9bJ+7N$)w&DJQ>JKPv#@zMFy>3Z5FWp2pA_vSwnHm4llO>;!k0!z&7y7WtW@~3Di zz`roC0`;$F7hDO;K85d@Y_VXWB__Kr{o??ndDP zr0rVabmPU)*IZ(~q9yheL9ZY#f9&z3#zGFB9~t?v3)q<-@>t-x3n?l;T(^w`?n7`?B`-XkN02Q<+T0|ql`Y+ zV(;%-mp-WVGMr1VjK!7xxtm$MNfe zd6+&}-;yFna^l1#8E|H-@Tcn70;9NjiCvC}rPlknO5IW$Gms_tT?o3 zl&d`Smmk#yMzl@*e9>zPEOJf$+RS)uci;7{4q3(8`nb6D|J$ny*6wcFn0rWkeRZ_xScB)l)ekXt@vGH~?<5RT9k0r_i+O9Zk@An# zrijq9Ts2Fop0SJP)=Y$F#H`K7GetR8$hcre`-YcEsy)S5U-{D7m>!n;9fRm^k5~f2 zWfzkiKP{@)VjOk8p&U-E#ZLzVZ8-Rs8SbY2wP~KAc=coEq*?vdiE++T#5RRna-I;xq4HDQP8`L9=EX$ zUP)pk^E&Z>bGGh1?qE5`ca|S7z4;y|My(sDz-ipNL|qkk@I9I!mENr4#5G93>E(5? z@+_!hF<(DjmlJAQ`n4oBnG;8qEy9~^INxTYxTWkKs@N<x_vNS1uteXoBOLGv%Z*-4 zpg?&BrWk#P(G~uz{L$gGH>=iZO3am-8~l+HeWga_KI2@Ca2<&fV0w2=X%BTQ^_-%dp8X>Q@5XLmA z6^O$aq2X@&Ll4psj+eNH$`9%=2D%!j73r_K2SO&~VzE$~E@_j1c+7oo4DvMd>78B1 zadI6_hl<$KVe29o60vCr8ary!Jx|f%snP%FsyDH1r6C}*WZp~7pb ztCG5tuj6Y&LN#g#yfP~*8{VaC{gTMRS4b!^mbKfgiM7SyLSN=eVs-I+>^+8T?ypS6 zxnWcP3Dh{clu(E4%7f;&+g?hnEs6*UusU20q_sXydK42c7c*eGoV{3u4DTa#SE!Pr zoyZ9L{(4TfjfWLUsA8o?n4+bNS8<p~&c6YxKGySY`CsaB>;F&l$ZHM)3(T3v2jC;(JUK z9V5>=Xun{j(HGkYL{Pp#Kq2CqzmG$JaW@V4(v!d?))o%4vq{!5T;U+OBRu1=bsEF* z2?-o?1HTS&cU_SqO({E`BMVC*FslRqnnh#DD?xWlEW6$q6V#4 zx=$|AX}zH(HWgm^)a>I<4vG7&W|sKCwin?|$F{vqr;fZfini_kJ2%NM{eq^9dU+;? z-gKSGcApKVUkgT-aN@={3Yq#XZ>IL88J*U39I>@lD!^4BAfMZSzVGzxlDfg3hdsQs!^(9Jbpa=R)F>C@E#N#`up;JjR+@1>Iv`tq8ww{$ z<`QcPd+|rGA6YvNW5gU!m3|2QoRefq=2qUzpK1ISTdSei<~*sT3lUyDCggMC{qGp> z%jcNS0zabp;WaoYX|Th}Eq88tOpOi%)@$Q}cz3#C8TXR6 zz=)L)qmdj_sM@0re4E?{Te36d=i`1r1C8SDcLu;kPQ0^J9t0(Vo1`Gr^zMCDQe?Zf zFoi$;feMczrvnI>%7dhrY+&dKq!;!`t_JrRy6atvvM4lS)`s@!uuzKk3sW)S0?^vf_34 zpXvSAkzDousaOP;YIjTH`D5@K=5%`olWJ2!yW~+ORXW!W3$BE^63ODh-3ibyt=ncC zabypZmH|(|>$<#oHF&Rw2(+JJEPi+M;cZ6mI?lVE6QlQ}(IA6)vkt$(*0B&hvnRQ0 z_N?Q?-FqISi$F7UD{t;uqtp^**GDBD**j3HX2Ze>h8pibj_fsQHCir0b^BJQ(;Ipb zhGEp<497ts3U6KTw+np2sYFTh;4c&O7MFv=pi1xPwb-y%t)n-P$sejbSc9_f+(9Rt zk>!85Qt7CPj6$iBO+~(ecPVKuYAj1XkVD$f0WJEWR?G5Gk}T_a2x&14ZH}^Ak(Sa^ z3D-UEd+7a#X1AV0&i@BZwmU79^oI(Rf6(ly*z=lZk=xy6XwS5s*H9Bb-^=!ub#drX zRd<(a(*7WpHRzDw(?dIS`De|L1|7;i{r*@wbryh>$lg6ts25@QA;u`nE(A4t2g~F$ z9pi9XH~r8A2qF|(ZP#TOy?o=tG{eWWR%(U;yq@ zKzC*I+yePopu_c#I2&-jj`MFI5!YkE1E6P~KV3WiPl^AL_Fz|G<8Yn`XwOUr-Mx^8 z>pxZSf4RpW&Hmpq{D0PW{K?{d=(@MSDv$u;z)Y|h)PbYm2&e)Ffe(BD-Usi3SHVkQ zE2sdEfK;#m+>g4-a6Se4;5r>=(*+!Izz*;tC;&;|Q;-o?xz=}2s~v z&cRRN@EogBtJMl+P#-pw4QGPizWpu!A&XCp8~+m{;~VksFcR~n6GtZCqSrreqQ|gz R=y6CHm8Vik-z^?O{s#)mwLky> delta 10738 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 diff --git a/src/lib/scroll16.c b/src/lib/scroll16.c index deaeb1fe..7305f1dd 100755 --- a/src/lib/scroll16.c +++ b/src/lib/scroll16.c @@ -396,7 +396,7 @@ void mapScrollDown(map_view_t *mv, player_t *player, word id, word plid) sword chkmap(map_t *map, word q) { // bitmap_t bp; - static byte x[(MAPW*MAPH)+1] = { + static byte x[(MAPW*MAPH)+1] = /*{ 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31, 32, 33, 34, 35, 36, 37, 38, 39, 40, 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, 52, 53, 54, 55, 56, 57, 58, 59, 60, @@ -412,7 +412,7 @@ sword chkmap(map_t *map, word q) 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31, 32, 33, 34, 35, 36, 37, 38, 39, 40, 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, 52, 53, 54, 55, 56, 57, 58, 59, 60 - }; +};*/ /*{ 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 1, 2, 3, 4, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31, 32, 33, 34, 35, 36, 37, 38, 39, 40, 5, 6, 7, 8, @@ -434,7 +434,7 @@ sword chkmap(map_t *map, word q) 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31, 32, 33, 34, 35, 36, 37, 38, 39, 40, 5, 6, 7, 8, 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, 52, 53, 54, 55, 56, 57, 58, 59, 60, 1, 2, 3, 4 };*/ -// 1, 2, 3, 4, 0, 3, 3, 3, 3, 3, 3, 3, 3, 4, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 5, 6, 7, 8, 0, 1, 0, 1, 0, 0, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 9, 10, 11, 12, 4, 1, 0, 1, 0, 0, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 13, 14, 15, 16, 0, 1, 1, 1, 5, 8, 1, 11, 11, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 0, 0, 4, 0, 0, 0, 0, 0, 8, 8, 1, 11, 11, 3, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 0, 0, 0, 0, 8, 8, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 0, 0, 0, 0, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 0, 0, 0, 0, 1, 1, 1, 1, 1, 1, 1, 1, 3, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 0, 1, 1, 1, 1, 1, 1, 3, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 3, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 3, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 3, 3, 3, 3, 1, 2, 3, 4, 3, 3, 3, 3, 3, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 3, 1, 1, 1, 1, 5, 6, 7, 8, 6, 6, 6, 6, 6, 3, 3, 3, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 3, 3, 1, 1, 1, 1, 1, 9, 10, 11, 12, 6, 6, 6, 6, 6, 6, 6, 6, 3, 3, 3, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 3, 1, 1, 1, 1, 1, 1, 1, 13, 14, 15, 16, 3, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 3, 3, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 3, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 3, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 3, 3, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 3, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 3, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 3, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 3, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 3, 3, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 3, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 3, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 3, 3, 3, 3, 3, 6, 6, 6, 6, 6, 6, 6, 3, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 3, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 3, 3, 3, 3, 3, 3, 3, 3, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 3, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 3, 3, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 3, 3, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 0, 1, 1, 1, 1, 1, 0, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 3, 3, 3, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 0, 1, 0, 0, 0, 1, 0, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 3, 3, 3, 1, 1, 1, 1, 1, 1, 1, 1, 0, 1, 0, 1, 1, 1, 0, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 0, 1, 0, 0, 0, 0, 0, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 0, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 10, 10, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 10, 10 }; +{ 1, 2, 3, 4, 0, 3, 3, 3, 3, 3, 3, 3, 3, 4, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 5, 6, 7, 8, 0, 1, 0, 1, 0, 0, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 9, 10, 11, 12, 4, 1, 0, 1, 0, 0, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 13, 14, 15, 16, 0, 1, 1, 1, 5, 8, 1, 11, 11, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 0, 0, 4, 0, 0, 0, 0, 0, 8, 8, 1, 11, 11, 3, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 0, 0, 0, 0, 8, 8, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 0, 0, 0, 0, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 0, 0, 0, 0, 1, 1, 1, 1, 1, 1, 1, 1, 3, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 0, 1, 1, 1, 1, 1, 1, 3, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 3, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 3, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 3, 3, 3, 3, 1, 2, 3, 4, 3, 3, 3, 3, 3, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 3, 1, 1, 1, 1, 5, 6, 7, 8, 6, 6, 6, 6, 6, 3, 3, 3, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 3, 3, 1, 1, 1, 1, 1, 9, 10, 11, 12, 6, 6, 6, 6, 6, 6, 6, 6, 3, 3, 3, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 3, 1, 1, 1, 1, 1, 1, 1, 13, 14, 15, 16, 3, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 3, 3, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 3, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 3, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 3, 3, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 3, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 3, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 3, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 3, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 3, 3, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 3, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 3, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 3, 3, 3, 3, 3, 6, 6, 6, 6, 6, 6, 6, 3, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 3, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 3, 3, 3, 3, 3, 3, 3, 3, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 3, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 3, 3, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 3, 3, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 0, 1, 1, 1, 1, 1, 0, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 3, 3, 3, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 0, 1, 0, 0, 0, 1, 0, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 3, 3, 3, 1, 1, 1, 1, 1, 1, 1, 1, 0, 1, 0, 1, 1, 1, 0, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 0, 1, 0, 0, 0, 0, 0, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 0, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 10, 10, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 10, 10 }; /*1, 2, 3, 4, 0, 3, 3, 3, 3, 3, 3, 3, 3, 4, 1, 1, 1, 1, 1, 1, \ 5, 6, 7, 8, 0, 1, 0, 1, 0, 0, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, \ 9, 10, 11, 12, 4, 1, 0, 1, 0, 0, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, \ diff --git a/src/lib/scroll16.h b/src/lib/scroll16.h index 31f13d9f..2b7d9a67 100755 --- a/src/lib/scroll16.h +++ b/src/lib/scroll16.h @@ -52,8 +52,8 @@ typedef struct #define TILEWH 16 #define QUADWH TILEWH/2 //for null map! -#define MAPW 20 -#define MAPH 15 +#define MAPW 40 +#define MAPH 30 //map_t allocMap(int w, int h); //void initMap(map_t *map); diff --git a/src/scroll.c b/src/scroll.c index 8ea0507c..83e6ca42 100755 --- a/src/scroll.c +++ b/src/scroll.c @@ -29,20 +29,23 @@ //word far *clock= (word far*) 0x046C; /* 18.2hz clock */ +global_game_variables_t gvar; +static map_t map; +player_t player[MaxPlayers]; +page_t screen, screen2, screen3; +map_view_t mv[3]; +map_view_t *bg, *spri, *mask;//, *tmp; +planar_buf_t *p; + void main() { // word panswitch=0, panq=1, pand=0; - global_game_variables_t gvar; word panpagenum=0; //for panning! int i; static word paloffset=0; - planar_buf_t *p; const char *cpus; //static int persist_aniframe = 0; /* gonna be increased to 1 before being used, so 0 is ok for default */ - page_t screen, screen2, screen3; - static map_t map; - map_view_t mv[3]; - map_view_t *bg, *spri, *mask;//, *tmp; + //map_view_db_t pgid[4]; #ifdef FADE byte *dpal, *gpal; @@ -50,7 +53,6 @@ void main() byte *ptr; byte *mappalptr; byte *mesg=malloc(sizeof(dword)); - player_t player[MaxPlayers]; player[0].persist_aniframe=0; player[0].speed=4; diff --git a/test.exe b/test.exe index 50a400c71da1d29b5064572fc858d7e42366c2c3..8caeaa315596f497592fce4ba690dffcb36ac1cf 100755 GIT binary patch delta 29 lcmdnDk8$5VMj_uQJ4OSB)eO1}D!l*yXR$Gy*eIkE4*-?M39tYF delta 29 lcmdnDk8$5VMj_uQJ4OSB)eO1}Ui|<6XR#%`+9;$G4*;5u3R(aF diff --git a/test2.exe b/test2.exe index cec7013a9446316a61a9952728ba670797138ca4..c2d3cbab8a33d2f6958e3ca969157f9dd4ab0c04 100755 GIT binary patch delta 29 lcmZoT%h+(1QOGx{fx(1fBZEGJ4)6c}PuUnwY!u2%0|1sQ3TprW delta 29 lcmZoT%h+(1QOGx{fx(1fBZEFe5dZ)GPuUV)Z4}B&0|1)y3l#tW diff --git a/vgmtest.exe b/vgmtest.exe index 11f00107fc61f12ccfe377b4da34e94fec4bdb18..3f7c0ec03b9d1d23dc7750187c1cc8e65efdec70 100755 GIT binary patch delta 29 lcmZ4Xo^jcGMj_v*WsEiqiy5;S&hq^KAH&XYVx!QMasaOm3#b49 delta 29 lcmZ4Xo^jcGMj_v*WsEiqiy5;SKJ)$mAH$yTYNODUasac|3{n69 -- 2.39.2