From 54750ec63f67da02ad05e13c7bf203e178f3bd7e Mon Sep 17 00:00:00 2001 From: sparky4 Date: Thu, 26 Mar 2015 10:10:34 -0500 Subject: [PATCH] The game can now load little tilesets... much improvement is needed in the map reading area and tileset reading and image loading and memory management areas and such~ wwww modified: makefile modified: scroll.exe modified: src/lib/mapread.c modified: src/scroll.c --- makefile | 2 +- scroll.exe | Bin 60325 -> 60398 bytes src/lib/mapread.c | 16 ++++++++++------ src/scroll.c | 6 ++++-- 4 files changed, 15 insertions(+), 9 deletions(-) diff --git a/makefile b/makefile index f65afd21..2a53a385 100644 --- a/makefile +++ b/makefile @@ -4,7 +4,7 @@ SRCLIB=$(SRC)lib\ all: test.exe pcxtest.exe test2.exe scroll.exe scroll.exe: scroll.obj modex16.obj dos_kb.obj bitmap.obj mapread.obj jsmn.obj - wcl $(FLAGS) scroll.obj modex16.obj dos_kb.obj bitmap.obj mapread.obj jsmn.obj 16\lib\x\modex.lib + wcl $(FLAGS) scroll.obj modex16.obj dos_kb.obj bitmap.obj mapread.obj jsmn.obj# 16\lib\x\modex.lib scroll.obj: $(SRC)scroll.c wcl $(FLAGS) -c $(SRC)scroll.c test.exe: test.obj modex16.obj bitmap.obj diff --git a/scroll.exe b/scroll.exe index e44f8420e286ee027de8062c918fbeb546d766c0..369e5afeb6f0b12edac53a9086a608324a18630d 100644 GIT binary patch delta 16887 zcma)j30RZI*8jXq-h>b~3Hz=rVHFfnTo4sQaU%lmmXs|*WormnS5VXvgX^@mwRUl- z)vj7>jc5g>b+;A0wMeb4OT8~*saL&fUEqIalAyQWeZKD>pS(HqJ7>UcZ`$n)h@Y%DrLvi4-x8E z%9^ro*Nj94uH!9a?u&*AHPXt+19D`Vdb{=rZ>qX&Qs3uNSTQKUcs};}0Uo{m;IS!N zW(wf4<#isNv&~_aI-#TvNN4e_SGlS8tDn^r2N_$8XH8Wy<7}Zb+8kq%5B^X2XX5*x ziSuA1gE}rV)J6_$>_7+l64Ssa@x$&F%>dOQ;F?k$#g&7=E~C^eN8-Xk$%Ia2&GASh zh9%T~%bJIy)m6WV$5r)b*EFwQBEnA_03X7K3b90pbWF>xR*Oa{?q*`DYovWqr}{vc ztw}jFSt-;mxyKmTPT4USt1#3VdLYKezxnj<{20_J5IKY_eYr`jtr^LH;Y$E|Lhwfj znbeN}AC@XCehEko*pX?fx>v0>W#5U+ezJ!%sh^zxjZTS-IRc$G{!9G#Q%3#dIpP0J z_JmcoNByYt4bYWrR6p#@p_Z_fS^v$91fn^V+M&J&gK0Hm>XY+VVXA76%9uN*s{6*n z#@k{E)^HI_8eYh$s$YPf+!7}w7}edY)i=Z+W38r(3kMq2k7}1ZLY02vr37P3&)@^& zQ09S4l1%YO7po{H_DsH=8K7g`)7?x3|y*tu3d5)8LZCzCo)$ejro#9BfbKn#GP2waS>+g9yhgXv`KwObQ)q* z-=Pb_PaJEpYmHTVQUWgLy{4oNF{!&4^*tCijcF20(>>GFJEU_VQE%C-8wri~R1R*{ zk*T6%q<$oRFxb{*U-1GsHFWtytLh){Wxj9R!NI`ocX)P-0}{bh z;uQ~#w_em{&zRL>?t?^(<0LbgA-G<$&#NY8dgf&7>Q=z&zGs|z-|UFQOL(@B$<*Q9 zLO631w+msh4+nw99(8x;??nI2K~&>RqB4pRKa9?toMBa?WL8hTU~a^5Qa{;owEAn$ z9`OY{Rq8*)%^&oe)c3?AelT)o9*O0?Vn~3QLE@o6vB_2R3NWd!i*o`@Q?C=QhwtjI z6+PlR_)}>V^CP|})!4t_825ABIbuK(j+ZTDzQDU>VeETuc#q6a-eoed)RU?<*m*It zH`pl$beSOJjCM0+KQg7VVz(=4>t=vuan+-0uEX2TJQ0aM0c4Py$0P9!e#x%ZyPK~~ z>gM?+u;jXV@FDeOjY(aj=}G9ulbpT$vYi@v7}PFtfSeMK#BjN_2|HIjQ2t`T-xSoY zEbrl;*YbtjQ~sHwwa&}9Rjy%5a9{iISXXx|c*EtGdKpaJN<&YwapkK$rj=Da#+3_t zh>-{VsJUSHmw2K5|7EW47zeAl+htaB-;r5c>B18g|JB+jf43GZtW`8n#TQE*1~D0U zghROep{tc~3YR=z16l_snxaxQmel6xX>~Ce~zU7e~#ol z+vvw*sgs5ojHf$=%YSjP>e-D=PCoW4y{KIpBrd{xoc>R{9PF%iUFEHIUF5C$%(&M1 zMb-b9VSUdNtH4Ob-v*D#!a**RSzi}ya0!#QI9cU3;tyRSnc2A2Mdef(Wm?(QT?^ly z&Ku$*Eb9{*Y|3skIZ=PFqJBKm;W^|H@$6^^9Mi|6`uu(CidpU=CMw0x?Bbfmvu@@K zuxAyA(Cw(JXC80<1In|Z3>|^8VE#9hC(tsur^fsgiX%v|c1b;|RGL=mdn7UldvZo2 zh7i2diC`MDD*#GMJp&Z`Rzq20DOW)`4vP1KNi*QK8gnuf|7j^MfMO;T+h|c;uQBVO zbkb6)(U>ctbkI^-rZLw->2q4jzOYIfdtGB*56EVMnBM?u15m8_0i)?7)=_c>s}YwF z3YNtb*MPpW*iP4D>N{m@rviQ|*iH%j)UXgFHRiP-J0!Saqw5oi$40N6UX5O-y=s@- z=jOqldB62qOwUJ48g_Y&WEg+k;XT6*Ng(mr!ou^RW#7Mgh?n4LK38Rga|bvLqkLau zT|J?6eTz3dZ*1{}=Wkp58-Dih&$|XvMqkPZri{=AzkXja1D1iiKdfn5CatalFMfFR zwPjM&*~f~Ftb&C~v61lG1DoxB^D@kbtPpm9{UiI}wIQR!cn@)X53r5W#un(@eeq9M zqxwnhk|$&m)%P{#qab_11wRalVOdYC3hg`fpHyxs$aU8)>9)z;1i3;NGQ8bA;@3WO z3*}%7h3!MM^CSDo4v*e_#2JZBj?aQVi}o+WAB2W8%kat2pO_}RHEj4GIj0eCI>Ch8 zS3jvSIIYTlQgf|3w&&<;tUc=VfFhxn$(dE~prtzCU{}@Pu_}qlKSC0BF0MJTrBa&M zTFG^6MOy%MjF2?iA(9A+M|_V7DhVV$LIgZJmLW(BNIo~7Km z{80VPDrKNbvMmC<;l2k+r;^dP+4nZN@$dH zo{DQGzuOK;I-5-s=9lElCCPWA1^yT*s&QYYgP*j0muIUbVClb8&A=Q~CqJO2$l zZ6Aod8;`2HnGQpb@oeYj%nUe8)ZT*pSiU;D+cZ@MZfO2qA_lmEcg>vDVogYDZ}G;X zM*Q<&cUC6FcL$GVDsaM(GNujh7}A$HhffR%WV4mHbI4HXGzH|3qm?)+aX1^U#4jgC zvJ;i~&BQ1>nPSDym3^Az3Vb?opp#5t^oQ@r&JL1ayn`KwP6^@_EoMQ{^2{g&HA)Uf znba~d&lxWtdOGor>xiD7%AqwAgh0qX;?6yQq?M#pEkw~U`?%(sbRn?wmhrfF*|lS2 z&;3*>U%AQHCho$!AF>E$L7^B1Gf`n@N|6r} zVC)^UVE|1^=1$^~dF`F=Y&(Q2M+|fL%ats1gUpm76GQMfBZB)oDvZ53VN*{JwCSfb z9)r0twutk4j7Om5)lSB&BT8tt*dSl)*L?I^8ct3wn9fV<1wm@MWcqGvmk=1L zkQ$-xelLfn8foMYyV2c`Ym;t+g`Vcgqqf}^>K*S0+wQ^7ePP=}_<1A@{KKpnwe1Pe z-GaFXiAGm3&Q;Ucgr6pRjvEf$IQX_hrY58Qhc&-8&K+rHMw|&UwFS&H-Ffoqa8&u& z^nK*Xw7tn^f`DB%azBd*JzZl)sL=_Db*|I*PB;^!F*jlDs5IssylYejGZQ}<)xU4M z(Aa~_5T|$b>2YrtdfYDw#5`Qt;kJ;F8W^@9>e1-Xx=?Y)_ju}1Rw4aFH_i?QF{2(kOutqcpadw0%rcrcJ`a z-N0qso;HYemSUH2L3VwlAYfOUbQupD=Oei+4D-K?XN?O7O)JKYX1(v=6XS--GwJ<; zhv;aJ|1oJS8^>dxbg$&=F zqOe_xU_5KtB3obu|NEE#kxMo{A@JYsFkW`B8xIqd(uy?L4><#zr|!du8=^%I51c(d zg{^;tw~y~9`-gkyrOt7pFaBY?|IjSygL6S=g@Xv>FyG3n{C?iYL`4j zm4#3gquhgs8;=lbk~<}#Ypov~%U#UFMELr-v4KJSP!$S1kG%=tWBJVujm;gV#vCSGn6yTns@hF($ z)ySdFX0tbHD+#i}jPVkK*=mKYcD$Hwvq8IxoR(<1)pSjY_)@wG=CkBt=& z>TDo!WhGbNE^dF&c?zQ8G1?(xOY5~goU#4<)uv`iczfIl5)hf6R{U&;G!2Gpo>i$* zn3t(0O}kDx<$|yu2!v>HKqPw*j|g4RR^H zRo4p9?tp>R5SKo#!FE%8m>L{1C7T6TSurJAaubfqH}SqHfvmd&zBpx|Jy{EpJ-tRW7Xv;oXcRcob=MC_+qsE`aVDPGHp|a14pQ{|f&*e3zYhVMqEiQ5} z!ZH*8cm&&Q=42RSI18N+FFyj;t4VT{ZkXn)>?1Y0_mR$Q;e^WqOqTJ;FhRtz(>w-| zJ;T2KY^3m;z_ievfb0W4&EOmMTP_Pm_sartVbSlJHO@#-XII1I8BaL&yaK1csA6|1 z@cbA1u{RX>y%#IkR}|PaJC$916VJ}x$2!(j}`R^yRXhxfvUpl6Lz@iQrS3JD;3KCT&ddH*D7>u*epNeZiz z!mxe;#0}GiMt*Z`>0`uHB-SKd6*zrl&0|d^|D|K6wB~VNz4A-fy7R=OWa(R?_8Rt_ z9$)>3Fr$UGw|ADcwV#D`&>Xqdfd%l}(xfD*yVT%ka!iuK+5yoHGQ#s`M002}x4s`pCZ0(~SgI#?)96JOtpp8VjlW{+bQP+U#@Drx^XJ`iW zm`=4`<1Q|3@hWJzo?pb_w+lxz7x1ORmjd>Z2(s@Nvb`BwR=w|~sJX_({?ph-+Up2r z@vI^vNd8`Q7@i-!JhHk%su8z6oZiVsHp5OgLV^}MLkuUAdzCqVKb1)~aGSR3Aw1?h0D*v$t?@Xd)uQ6zOw!=qq%%R{Cq1wks-ZMANW2Q8& z*)qx2_Xn0A>{1+n`xm>p7Uaj2=e;UN`8kH1{+2?+m|`sO&ZC`2<97W^$?j5Q$1wH+ zFOf)CuE$XtEXbH1giaQoECgkNb@Al6bP_zd(V2w4N%0rbfmVj*;{_FZW-0!oq95aj zT?}DN2TnAEN%qV|C=VAH`mxFiyvh*DyodJyynP-*o_J}wE52=TW)5Pe(!=>{H-uPF z22Wu>(0JIdUU*dH5r-y-{x4T(E2KGJk%6gWM&P#j{@e)e9{y{7f^;~%aL{nKaKeHYg(^5@M;yg(FGz7(10*${Sg$*Z zZ!PH0h6(tk?QT*R7|Y1d1ble2J8LiC$qRj$FkG@wQymQqXXZ0_(we$LsJg@qMcq&E zSj&CNA>A-&?o;juUUw6q@3Ack~9A;m;r@js9PbaE3;TNKFM<0s+bMPAakK~Rv4#r2E)``iGU zaZF&!i*rf~5F6Wf6F#_Tbe|6Zc4i2(j%k;H$Y0obv5KE05d=JZaiHg4z|mam|1&x}Sj9A!(E7E&y=`2x1LrtgxdRI~Vum1Yt9FUNTrs73u-^ z5?&X26)qq!EfvA&Evkdsx>rExWuX>E2iaAX73Cu-XuL!;R@h;e#mee}0t7*kx~^ig za8e&mg^9xM*pIXkJ1!w*!1gI7Ku=uN|pI@Gi0-N^*)ypJ}}+Y;q-9 zbr(VCp0M7PnpjX$QkYYkj{~a{m;^knI?AWl`n>W=vU2of-JE9_PTqvyt9JMA=1IHG z?Azd=5xhM#s7PQ)L?IKg2cN4>nXwNVr`jv>^aTZ_h+BWCnn*r}4FJvK{)P<%!7rZ) zmgJD`PdyAi@5~UU^8h5{L@xH&wShD-Qr*$MXQuzJ>zM zOs`z-9B86cP}poM*OQT5&aNy6n?_s#T>|*=q>Y$Wl7jLf{1w@KnnjO+#jPWYBa+>-9h&bfLePP7TtcJ z_SwfNbe{w9jlHh|>C8a+E8@UV-A_Q~DSlAsP6JV-Xaw#Bpbi2A+$%t~Dw5!-8xGbR z9A0+P{ToUP9I73V&K00@4&xnlG9cO<20OwEcdSMz(Q!Ngx;S`LJKl8Eg#xj{@dB`8 zi6B709R`nEjx(Hq+z8}ar{ylXbRgbv+T?_EB|!b*G{;$&3&dTg3}>V(1}e*W4kTMT z6OeB^OI&m{K)mmK8@Q{0x&si(M7lSCmbz59faHE4KX++$v93aHeb?d=vJBy+89M0F zLPT1C{L|&W3(}ndD!5N<9{}5ce9?8DD_u+)e4{pi+vNHf%a+H7q=U(yy56&_8ht@U zWiiRM>Z7zQUyBEqGjq>?luiT@CuJWc-n4wC@G^7=Y2O4zB0w;gB7bh?TH(#R5~lq@z~5!8uMet^fV@OLc)I#c<9k~V(RqHN)c zfViDXUpH&x|GTmdsB=K6bi?CU__>Nu_!$aRTOkY&nD%&uU!1So*8e|kbD&Otw@nsp zIw+(=foc;i+UBneh}-Hm%>Dn%wtqsMuiOT@6Wfw+K%pH9RNEq$B^rsX0j@l?EUTs}c&+vGz1w9!`JfqHErdtRVC%R|g39rStE&$r!W4H&^=n0bzyzCwy&@39s{2p7p5k{4Xs;NxuS_D;_1dzRrK*UZDGVPV>|? z01@sv*%MjcB*^}Dylj0$}o@p79><`+~DhcqxWWZE+o^UC!3h%Bw+Og=EGnBpJtJ>x6W z_kpr>uV1|B0?aSc!!Esk(T~s?1zvdtic3gQw*~|^dR_8Dy0?Jx@gCs~852;Gyvu?5 z6sQ{SEkKd9aF6$S{LQLZc-zypsx^Y-gNBlF5|BA=ne;Xo;mrOHPs?58~SsmfX{IVuH`ld>}dD|yEFXf zf!71^2Wyr1;_H}e3cQTV-tgou1YW?a-iYR}2daYb#0@dH;|(SM@4&u6nAsS|se-2C zK^tqi#2`(>fsGyvH@)u){NtPTTv6Y}IRCBd{EB|f{cz4Em9!CJ;#>X9c;VaOd~?5t z6vSuW=Ize+yWNjCP6b~2He~Q`J97{F#o?DWg*)gW(%A=x2NUjDD_7#A)Ac&KJT7=H zNJeuh!FhPyCKW$7*e(Pg+%$t<6wHNSuXp-|zaG3f80mIEVA>kYgy=p5;`87e!MaUA zoD4n(yzM|;4!(g4-iaD&7m^ub@mTPO0)v708zfFHE!1Gpvm+0gG z$A^r@r``$YGD9}v2k-d#7KE&}h?N`k#6@ZSG7vO`EXT2%WB83BzM(jGa{|9BL>Y=V zZ@%ccFQh31=?+6kxft>XP^W6QSI8! zM_eB!Q{i7eNaj3L_i^AB&)`VaAF5|I*ONhqOJ5YPDpVm|1W*RmA9(hb5!`*18gJeb z!O6o%;1gR$G1D6CxALrl7*|-3lTWO}KHK9tb@&$z8QYT?en$95;W+Z6AiVFx;oSQ0 zkMR8uqqr}^=irbXQQVPmEza7Z3VaeiBto|f4il~su@TVrAs~lFXd`sr05LXV8r}@T zb0W6lQ#*!m3nDgQ;Uj(ghKL;z;C7Joe;;ujsPBR5h?p3u+YiL!2w5a#4nWBxl|Y>V zYG7m%{`8~wxvi0(;7L2DaSf3l;+;EF9ajR`p)tBV=SxK z@bLg9tzqEDs~P^2DBo!O?I#Vs-$c1Z(_u4|(cE(tIYq98;cAU)!}!xdoNsgvKK1E% zE;@P^_WEo!pA)?>2Jimd9XEeg!0Dqau9OX))9A;?MhY3uD&fFFvp0>SK&p^+iO^;TU}^wSsH_TPu+)x_B+Av?M0q+jbDS+4j1Ym=J964~?KwUf#=>sz?IEvK*e_LZg%tUvYKkxjY7#kpPJYp=+Nzx5$^tFoM%iF( zg`un%fV&A+eH8}1p{$ZXkN*P#gpYwi1Z7Ql=a&;z7eXB zQ=FjHYD-~VmFE`BLHxnz(1}H*MK1s&qpS)}F#I7a3&%GERtG=VZ8#;B8gwyvh=Z4g zmcCmcEkv{Ds6rDrb93WgOpV*dS1OOF;kI6u zLL=5$j~b5We5Hb`lXYK(MYKGV(7`zzy5Eaf%DlqXzbjuwPgp*}rVu8>GOmb|z+WRn zABl5U6jmDY%jT7WpORjII(HjWXBFoiZ3<_89U3&m#;z!V2NfWc=2?D9?;uZUtEg+B}#isGET=?Hl0Q%LI2GlJF|v7jTd{gt>=P&B07J zE;jdNWux&rbC9p|Xq%@JTP-H&4W&>8ZcfjbeMY%}05#ldU4L8IYA)aY%v-e3-hhFW zf%r>S9Eb0Zj2YQmi}-Z0Hn&ozDhQ*Zl(0We_q@Us1(kbdpjAI|!Z#sAnJ!$yw9 zd}AcsC#XGi%hC@e|Ug zAzu6&n3b+UJh}9R!i=jib;(5 z?HQ-Mq8#z?lHR7CtlhGzVsN*dJTURzGY%ZT4Q2X*=ecA%u$e_e0;x&D0{m?~EG8>! zLiw1IeC>oHxHaVY=V8s9l1VuwfWpn2O}Gp^=H)W5@!Ef2MWqCTS69!;(Z&C}6~coL z_GNbBnFqsVPsoXZL}}B(VCHMQ`=GnWw`vN}1qB@(o02{ert&QQ<)DYxrN8mgCQThR z0l1ym;hPATd(XIO@e|4Pzwk{Mt4PJKd=uvFoZ72)VnN9$5)N`;j3D&lFTaU|zqY*m zjgQB+v|gbJITZ%AB`AD{oez0=$j9~a#=cq()02{#kv>I(Z#8*_Tn8SFwlvO`R~pC$ zbN5*VUAf+%!^wwy*j3~4i-$a9B^zC(>SCllDUm1H$|~aC*kU*$XT~1S@l|@6c$nq^Jv#v_?{I>QAM4)`KU1{*>=5R)bi<=`{&-GRz{#_9S-x9X7-v?RH22qpEjB}!f1T> zu(vP#bq*arvL{TUEW{TAM)nE(;IO~TxM#J~;!_ZZap;jS)*}n2A5nQmXITd(4|)%w zva}$Fgpjd#?Gd-ALSR~lLY-DxWXLd-Rv@nU8Tt%7hR+^xV@}~4Mg`S#YNu+ zGiUIcZ$pDFP3^5Yw$xCdpEfluWo$ZRIF7a!fBaS@gID90<|W_t3wYRDg=8@Wr8&7| z_vguL25MsJccIn%G^^SQh;Pt&nXRnVQUE=MF|ws`#C^%U&weIEAgH!*hIJ?*7||4` zqP!rFWG*c;t&9T5<80}S%PcFXtA-JWZL%109mK`l^Eg+3&}2xIb_rOezvuV%mTyA0)3e#hit5mZRk9Gk)c34uLxf}u5e9% z(Pj?Rh8BxT=U~%!-t2)~{Ly#eUO(jaj(lo?AuWBPWox{Vi#xva9jLU9CUrqI1X9Ri z;O!tCVS+)bXwX`+o+R7A4>{VGeVmJD9}SK4$g?Sj97|td$RR!R{TmnySid~H=b$TY zJ}R&kHj>A`9<`GtgIenFw~q$OvTSX59t&j`=i%gIN_K4?o_egm&(>b8+By2Nd9b*N zS)dwTM}Bb3YsScYn<-itG+RG;XGm3udgu)8%OqK7F3c@3f=zbMg?cw537|P6UmeZ8aa1X414~dYUE6BMuATSjdn5 z23h20fLx8O@4uZ0n6S6EHz{Rlld>|PpAP_np1>Q>vLXZGyb7#Ea2x|!8*sh-oc;6i z3}q#`qyy3To0B0f;|i_AQ)wv60c~sX-IF2A$JpyscoKc-OXDVF&=r;C;TYA9aMV(?PC(+EhRsw-~$^&pI8PD1F)14J$m;23X2S_1qX( z@_w>CE_fMFI2jeW(k86cjwzg*l{LfWCY<>h$AaN^PkVcO*NcKGtu0w@#owQfkzL@d zJ?75@XZ#9+bZ+1(Uz?u`v4c(tjPpYqhg{C;|C8rB*V-Aawj`H&C*o(?Ms>j%@1P&O z5$XYeya9#EBp=l2%SyDlMF#THp4+(h7NM1V97lY(oA%y9&yopdj z;{>mPU_}#}yvhJ2nR)uM;^K^=IfVv9-d6NN6AE+&L|!@cB2&r{d1=sFPJvSb5?xX# zL~rQHy*;qWg?AQ7%E+y|wVY8l50MLYYmwZClZ$feo%L(j^t}($*znQ!a+Xo!FVDun zpB7&^JJj{BfiSSvPbB=Z=qZkA9a89>AchKj)7MNlDPFw2r#Et^3W{AoPFKLHiL5I=`cEPPq?I-K5kmj1y7 zg5xuSB65_Hy0A`AJic)LBl2HX z(Q+Q4!BTiU_aRJ{{?ApOJqxs>)Eim{KS1$P0iHxUfl_s(Hg>t}<{(WbdaI~j+Nwhw zMK)4oBVG?ZoJJ9H`i09(+UGYZvWX($w9khrLQcB~9fof`wU4EJ_83LlActMJWrgn= z+WM7?Ze^<|hn!mBu9-Y~KPf=5sD<(^Aekz1Rz;}TI-N~IASuGI+KbgK=Uj;kDwiNSmse=6**&&gC2svsv$0X(aqr? z<Y%mxaisPFI9?zWLJf|g2sv;dG#UTvf>J?&+Z0$&ed%qA&_8)XWgw>G$PCAj z>eAyDX&lhzCG7_$@T>-FfgVq39j*p?9;MIW_ksSB(pPX3(9RQx{673E&_gNxC+=zU zlI2nwP6>e*Jp)$J0y!%nMCR0+^o|Ar@}kcY1Rhfvaw338MTa;F%;(8z;H5TChpDtc z&jg6YaX-1b{fi>~A!UbM2EM+wA(Q&Rk&0(y@zaZ5(iBR^VZU}SX(6S@;1NJ?p!6*K zBGCV!^m@D)=*N`af!}TSk_D#|Jx`|Ke*vL#N}s_`+r8Xgr!>j`Eepfn zW`@Hh$_cdemCmxAhA1S7za{+j?UmI~4oUanbqDEv^a_fQTprGQ_T*{%SeD=N$wb$I zT!Jd;6z`@8$%o-i8NR`^AHY{b1(ih5zKinm2}0a& zq%TYe52-4V4Iz)-Pb^R@%AmrrDZNGlFrSw!m| zig38~f>KU_4YUdbgXpWYOtM6T=5yp}`&fD(3DeHA(S-!13tN^+k#U7Mu+4MiYqan& zWe3`7(qD_!Ur;{H3z0M6uR{}ug}y-PXwSg}dnHU0&u*k9#a(s_N~UF!`yu28Uw`;o z_JFsDjFh2^(@dpEdPn{!a6PQ9+Z2)FEtkCAp<33OW*#DMAuAxZfv;^i7I< zhYy4N&y@a}S{F(tIn-`C(LnPt1pi$ay-ep09?yNeIsD3XFP!*mMli=!!#8pWXV;(O zzEE;p|92BP?w#l%96v2(MEtAq96uO;^6O%zy&?R!V1~`gYM6K>lwp2vFkIcmF!Qnh X_0^EDe0u#J^U1a?zYBcQs|fu+dgvE# delta 17397 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 S{r*!*xAno#Vm4wvLjMmCgy`7- diff --git a/src/lib/mapread.c b/src/lib/mapread.c index 86dc10af..f0e8ac0e 100644 --- a/src/lib/mapread.c +++ b/src/lib/mapread.c @@ -11,6 +11,7 @@ static int jsoneq(const char *json, jsmntok_t *tok, const char *s) { //this function is quite messy ^^; sorry! it is a quick and dirty fix~ static int dump(const char *js, jsmntok_t *t, size_t count, int indent, /*char *js_sv,*/ map_t *map, int q/*, int *w*/) { int i, j, k; + bitmap_t bp; if (count == 0) { return 0; } @@ -25,7 +26,7 @@ static int dump(const char *js, jsmntok_t *t, size_t count, int indent, /*char * FUCK well i am stuck.... wwww */ - map->data[q] = (byte)strtol(js+t->start, &(char *)t->end, 10); + map->data[q] = (byte)strtol(js+t->start, &(char *)t->end, 10)%4; // printf("%d[%d]", q, map->data[q]); } else @@ -48,11 +49,14 @@ static int dump(const char *js, jsmntok_t *t, size_t count, int indent, /*char * // printf("\n%.*s[xx[%d|%d]xx]\n", (t+1)->end - (t+1)->start, js+(t+1)->start, &(t+1)->size, (t+1)->size); map->data = malloc(sizeof(byte) * (t+1)->size); map->tiles = malloc(sizeof(tiles_t)); - map->tiles->data = malloc(sizeof(bitmap_t)); - //map->tiles->data = bitmapLoadPcx("data/chikyuu.pcx"); - map->tiles->data->data = malloc((16/**2*/)*16); - map->tiles->data->width = (16/**2*/); - map->tiles->data->height= 16; + //map->tiles->data = malloc(sizeof(bitmap_t)); + printf("ed.pcx\n"); + bp = bitmapLoadPcx("data/ed.pcx"); + printf("ed.pcx\n"); + map->tiles->data = &bp; + //map->tiles->data->data = malloc((16/**2*/)*16); + //map->tiles->data->width = (16/**2*/); + //map->tiles->data->height= 16; map->tiles->tileHeight = 16; map->tiles->tileWidth = 16; map->tiles->rows = 1; diff --git a/src/scroll.c b/src/scroll.c index dd66f556..1b96a6d2 100644 --- a/src/scroll.c +++ b/src/scroll.c @@ -119,9 +119,9 @@ void main() { /* create the map */ loadmap("data/test.map", &map/*, 0*/); -// map = allocMap(map.width,map.height); //20x15 is the resolution of the screen you can make maps smaller than 20x15 but the null space needs to be drawn properly +//---- map = allocMap(map.width,map.height); //20x15 is the resolution of the screen you can make maps smaller than 20x15 but the null space needs to be drawn properly //if(isEMS()) printf("%d tesuto\n", coretotalEMS()); -// initMap(&map); +//---- initMap(&map); mv.map = ↦ mv2.map = ↦ mv3.map = ↦ @@ -521,6 +521,8 @@ void main() { } if(player.q == (TILEWH/SPEED)+1 && player.d > 0 && (player.triggerx == 5 && player.triggery == 5)){ player.hp--; } //if(keyp(0x0E)) while(1){ if(xmsmalloc(24)) break; } + modexDrawBmp(bg->page, 0, 0, map.tiles->data); + modexDrawBmp(spri->page, 0, 0, map.tiles->data); if(keyp(87)) { modexLeave(); -- 2.39.5