From 4892f03f6dc63dd7af0278bbf474f9c93008f585 Mon Sep 17 00:00:00 2001 From: milang Date: Tue, 6 Aug 2019 16:15:34 +0200 Subject: [PATCH] fix (not totally) darkness bug (delete transparency) --- BitmapWs.g1a | Bin 13956 -> 13700 bytes Makefile | 2 +- assets-fx/img/brouillard.png | Bin 1471 -> 3810 bytes assets-fx/img/houses.png | Bin 2783 -> 2907 bytes build-fx/assets/img/brouillard.png.o | Bin 688 -> 560 bytes build-fx/assets/img/houses.png.o | Bin 676 -> 548 bytes build-fx/map | 313 +++++++++++++-------------- build-fx/src/BitmapWs.bin | Bin 13444 -> 13188 bytes build-fx/src/BitmapWs.elf | Bin 21792 -> 21536 bytes build-fx/src/map.o | Bin 1428 -> 1440 bytes project.cfg | 2 + src/map.c | 7 +- src/map.h | 6 +- 13 files changed, 168 insertions(+), 162 deletions(-) diff --git a/BitmapWs.g1a b/BitmapWs.g1a index b2d8518c4f37c6d2f2664559604d1365ac1fc692..a7f49f8f3953b30038593a118671962c71bcc923 100644 GIT binary patch delta 1023 zcmb7D(Q8{}6h9~FE$L0t-sI-y-u5O79A|ppi&A8ve=iERHALg4RlsJ za9cwyEW%_BpI~u56xqY26O3FRBuIC}G!gJNE~84(Ge~ zob#Rg{l4EhclG4zoATxt-+j4O`}8B9{RinY4{iJVx;*9{AD{SY(m)(H|HSk7)Y!2a z>;j1dY^>msy4L`@*F2IF%3cCUe+CSo27iA8?8z#y1B<})Dc*4FxMSXMn_XQ7u&nuk zC-1@{-xe?7Wj^aY-*Xz+!3ALQWxnH`6EklC6Spb!fY17lE?dCdH^?i}hEZU?>%jaJ z>ucSNTJVcdNxYi4FATX}l&YbC>*C(qr(cjR{&h;bsouj|>g$PjtKr~$BCIXt!-Mag zk;8H%5tM_nCJ$CB@8lIl(SPcd6;#G*0oP zRQBHirnZ4eM2WU-ek|#T4YLtQAb!i+!HR$52RxF79#Z-kFUXT(rbF~=z=ntUx;)qW z*d3X0LZ&bDyc-vJQPnYSo=^{?FbpiY%^TW%)cAV;`*dz-URb`h@i*t2-uY{zsres1nOp`(9|&S(J3 zjR6~~ncA?7*x{oi)7UXrM+O8jR{)ld154fFM(U){&*nai^LToYA4(tM)$}}p`ZYa` zJ3K$SBIam%NLb9O*ZXrU8vz#j8kq86KTMNFqs1sj?N=5aZO!b@Bhg3zB&}XoVk{ef zl!|!%E5jQ669N_?o+8Kj)WOIycu0!^&dki51wfcNQ(hJ~Tq~(&rU_NiNd1|}@Xv*~9g9|SrIvI=@kS_Hn24UCk;)@`e0Ya}C7P;&;4-r%x5D z@CT3>z)sCZjs7)&{8g`f7l-OXsnpSR?18s zGcC&+G0k1wbj|S#iU=Cft zpgg!+V$<*t>tZ|p6yjapHW&5vAMtD!2B?uU9$0f)?tpUc0-JDo-C8_OwEA)l<*mwrHok2!0|Cj(MoB(iwGNg#xgn*Tuwy zg}Be3nViRcu{JrXYK2)~SqdccJ^wm$DMHo3)7gcnEE6fblD$ZA{hFP}huojOsTHVd zNLZ>>tBvFtO9D$YfZ6R(O%+8Y#YjibZl4czEEm=xWpav$)oON%v2=IIJLs8V75+{D zOH!(m0e|IWvW!uPLZG6g)Dr-t{RpLEsVvbpm79`Gv)iDeH6%3aNP<8uNlHaK1bn+B zNfb*RNu!}PC7I1GK;M$7W~SVsjvUzJz%ChNBmr_HIdqUFLkaXqQy>y)D}lg18{*?E z5Qi5j(%}+1tP)b8dlAk5B$w$l$w8O}T9b04C*9fq=8wxA;5g%{@Z{Hvp-%DP2CY5c z8$(Almt(kY28LXJwKqPoF1_=GneOjHo*(X@jxW!As!mXC&56F;oZ8RmjoDPK=8Bbq Gi~jaB^>EX>4U6ba`-PAZ2)IW&i+q+O3#tk|Vhd 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 JPDHLkV1h_iQgQ$Q delta 970 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 I0HlKf061krGynhq literal 688 zcmZ{iJxjwt7{{NB4b)5(yve0dgp$F@L7Xb6lfwL-Z*=U!^DDWsn0Q=e2Q8106Y2-1n( zGSM#hVB*F;R7Ev|tYwr6HKP-0po!GXd7@jUuA_#DcNRj-jG<+elF&;%fQBKwhw=I$ zbPPF$I0xhPq~x7pBJK(JJ`(KBV6Vzhp>NRaN8C2p-`qxrIq{d_<_9)EgX?k0<(GeX z`$K8ITBOrr{hBYASuy*cr}LNN+9rRW6J2fIR%JGYFAM9ReN?PxS($Ylv#Wf83I6_p zTYxWb&+T&mZyc^+$qkGGXy0hLSF}o}t_H_Le8SwC&>H_f+>g<^De;A1DD?0!H literal 676 zcmb<-^>JflVq|~=Mg}b)8(H8ESk44YYA~=eurP8kaKO~pK>-H;U;TduAg;rKL2?w! zGdVDT%y)v)V5flW0|K!5LIDCG`5-8bArDfE1H=3SqrrNS2$(oFni&#)@GumB@Ogn0 z3rIbbFN@&+|Hu%ZnVTM;kzZPzT8zw&Pt8j~;TLCCr7|$+6<6k#Bqjmrk|GG50b>>A zrzDmnVsjTBF=?P2$h}NZHNe=0xE0EW`2|@GNQ(uK2moTBm%(~L{sVfCffFhQq(FeN e14!tBnGgbIo*6r4pFT!gv_JQqU{?V^h=T%=A$Hww>%R_1tAU7#TW>rXo+#}a^J$thW(#7%(SzkmT0;q5=b4i$iP zPXp73c^P%wF&>~{x0iq=j9(oo8)o>r^CsTn9oK{yzX(iRr_eSZ z7e{7IU`-Fm%g}+tz?wIJc_?d|3n3pl6WJ0vZQn@+zt^_7cj?M;Y4Ocv?V}KNSML$w)w(Nd?+}z9t9cV8kc;WKC|*=YLEoilYD5A}g{^-Wma|zK+Xls-o%v zH4sv~fexSSl|#>LvTA|gR#k9u=2ozopK!PHDfc9ryz0(-O-lwcJ5l_>qH3g@^XMu$ zB^zBWw8G1t4!U&JGm67J+LH4;0jAb~NhFE3Zv4@rBbJTwfe7MVUX${kl}$X>3oe@U zGoJPiiSatguL0}o;>+HNmQU`%0V`xQ`@U_$X`WGZ3>)W_qbPI%i>~u>U<)Ma>x3zp@dp<~uBi8xh$SBs0`AC}}Cey%r!@y#Xcqw{8Xk`<> zhk3ZCoe%a5@lO!dPkTffm3MRrIz@YPEA{ODDA6Sso3ZCY}y}?;<(#!}rHa2!00AcJ} zZdP2e&BZG53KYar>{YyxsS4TbuKE;GN;X)}HA*G->zL`j4<+|%bT2`;G9#@iS$|D^ z?BC5b!lrl|R>alSz4-kB!Xcv^gA}H-+1&M$)1wV2iE~f@xL3J%Zm&{_H}**o#Tzs% zrq+Jr|Jlap*f+KmShk-_%aAW4eNXnu=czu8PxbvNkZ_%+410V?a3rFnQS_tEcH?|f F!}n`)EJFYQ delta 1176 zcmZXUPiPZq6u{q`WI{4Y>SQLJ&1Tv8rVw@5xUzw_OL2QG5fwrx(L4E_x*d{ zd*Aoo_n5iqxgS>V;Fl*#^YAZ_sK8E)hSkslKxiSXiY3MY3X8x1=HcBMup>8s9i0JY zJA4&w-1c6g7YsfD#=M6iM?!~hgdgJ)pNRY#nFV%?w(3iKH!`IR{{&3g0QSW!pHMDV z8o&ZCX@g4}vcO``fyHUZ@9}-lwGxX}YfWXxe66v$Wo;lh>b_nrWH6x9(|%W?!$GrkN2Idcy3} z5)hTN40obNApSJFkFw~do1)7IP?U+><*7_XUk>D;V!3me{&HG+x8 zJT&Qj{-WnPLb*)+#8N^um}5M3nyfKD^qN<{@Vzfq2Z(Q-$*sx!V zl+7Fw6Q&di%eIyFUdIsU;e8TVni7_F`Gui$1;Y>qS4Kg(BLGPI5z3`YMp-2z0gxlX zzJn|o3ZO%lE+P=N0&tB}J`Roou^&i@4j0g2Ri7%wMb!V7;e4x34*V>TPRRX^v}d2p zKUP}6v0%&a`RJ^_COL4Qbf-JL?}+B2_w|~q3jMd8{xiMs&L;}(pNKf$-$4zZDf}T1 ZP=$?o!DC}`h|w#vT&F;S-t2J;{{z;hPPza9 diff --git a/build-fx/src/BitmapWs.elf b/build-fx/src/BitmapWs.elf index 8718b2046299abb05537529b19c79244eced4e74..f3a95743a69d188660bf5ace414c72c16b4a3b49 100755 GIT binary patch delta 2565 zcmb7GeN0=|6~EVD$6pYC;196lXFeKSC$%qyv?L|ifJ37c3Acg5A4y3?mawgpvX&)m zYlD>`)zc!C=tLVDS>?8wW~G(t>M;$`k0cV(_#>KF$I|@KX|B4hQHv(FW?Ph@vEO~~ zMfLvNv+jNGch0%zoO|v$=elr(7m9qgi9dOvxq0~E3}bSzZ5TNW&RF}b)n%DwqC?VM z#<1X>!vMd7<=Gtu{t%#GtSSw91%J;w^MB-zbPQ=yQUf$;8kq%}ARDZB7ZQ@y4w$1a)bj<#;ZHkG9CYbPErVaZE zd*T!m_GOUP>6l}1y39n?4WKLpb~E8zVWI}K?W-T|D6_wq$D5yR{>cKKNna6Mi%BwdU{S{GOA|{@|IkKXUp-uiqPP_IN$spf@r;{zBU4^M!t2 z>-BjII2J6(03xN4Rf^G&}x=n zYqZ%gh$RD|6z21x-|?V&Ec~bme$7Q5<16Y~Bvi#;S2r3%yaqWHD>2dD!9-(T4K{l@ z-=y6wBYabxX=yOq+cQk;iZT(uNyP`hWv&+|ei)@_JVIUZF3QDE!l~Qw5xzm`UFYoW z$R0dGDPOo=-!772Ch8WL@U3fPWEN6OfQIAuP3WQtWGx=yf&;GLh3h^=B%?YhY}MXK z=sf#Z9TQ>1DSU(mc88~#6~C;RA3b{XC7J(6UmTmZ7fk2kONk|xvlru^C$_Sy=HcNx zfj_XcZ#cX;wpA=TzKE9{S6R_shsRzTnjG0;Mf*8fZXYat@b!C3ONlMb3AlI`kMvZ&&;Dn6>;Dunl zBx930uBw#@sumwT%XxxY_X@s1qkEH$Wr*Z;5&j$FFlN3|;ajKT-ZA$aq`Gvf$*Cn) za9?+mb}TM~3|GR^e$-I5ERTt%_9^@b&FvdR%H76yS+zd)Hs?87>{1$w5byM8?pFPb z33LlQs6A+?`i1N{bhm5Jy&J@!A$13~Cuwwlk`GaSf6`q5FRk;cpGN)`Xa&>~s2-0= zcEjqInTV{AwOetwfa)}4e~wB$PMx4eK^-!v*R_J2=vMd?2|kb&O$Cm z&Qz#P`XjxBcJuiEdTo9|>zo>Y>u=zH7e1Y*(Ujtrdo`?^VZA;``BakUX)zV?vl(5b zw&br`W5l7*dMfUDNGljvLrg3WVlO|XSXz2^Fs<}l#arx zJ*{{dd&ZFek=9X)X~l(|@tht3%P&#?^ieuGy;`Aa1)J1r({SS^u7VBljYF|~il$fw zUNV$?!Ndczz?TgCcbLip@6%1=E)%gFaIb-pnUU9l8+7??eyfX4_qfG-psgFUR@qvC zI}D5-Q9l5D#K39k_^*1R{36}zNwzJ3Rcolf08#0#FhpO4`9)y6!G9BNC`g^XNiECc z2K5G{F40tP#DgNkqwjs&hAciR_9|S^N^g>XOm}-DP4cdlBJu#OStgn`5!0A%&-x5B zy+xgU3O`PxeaSZI_G#UU^$qYULSuagxCFkDz1FJ;?IbPsDQz+s7Gu?)P+A4xHN(P} zSXHU@b9t|lHIsO%GJR}~5UWTTTM}5F)5E%2+kRlFw#mRx;Clwc*qH4I+IflcnL+n+ zAlB)|ZSz>QK({kWTSZW9@8d2St&sXP&iGZ}YGc(Z(ltw+2NW$FmksK_vje<8v zQ~gR$4m=}xj_u%81lNI^DtH(CsIJ`+H~wlFQE;>&k;-%nx-QXO%nNGp@qm-xB5`;p xx6sJpdA^6fJlx9LDKylI?>@{O^iA!XwE11k{q*TjtN%$E-)~^tf6!DI`!Ao(F~0x+ delta 2742 zcmZWreQaA-6~EVCu^lJ1pX1o6Q$Huo8qZDZ8IRK|TReFy=JCuaghFdE*a!;MjzvB`v^`Ws!Mc8M;gmV?9d@bIa_X>r5P) zW1@S8iMT;G9dUloe9K|FTq{fn^Q#SpgB!HzyTO-f%Ky4=mWd-!4KLG<|GYo*G86ty zCXUY1RO8q}jS1&lP$)nl$wXj_i6-#&ZQg0yW`A@ijkLz`E@`b{U2E^u!r^e6rrl}MVp`(G=~sRg)uORz;^HMO zqQze+MWfLJaz;25)wK|7bZ7_22t=Gs@4D&PK*GU%G#7Y@*XV9wI#iQu2V98jvob!j z&@|0`E8d_3>p8GQ8_hb;)7|E?Sa1Kn=bLUb5yb+6$U|)1T-_Jvykc$y4|0B!wnNiR zOTXi}!_0>tj8Q>5ya!o79Mr-89LV*=Pl-Z>o9jiHMLF~ z(f4_PDzUG?Z?f$oubInjeLPevvu*6pAF*ABkjwp7>F)k+xBS{7Z+r|>Cga0+F30ci zfH~X#X$Rt}Bu?-Rb2|}t^6TcKjyP|+0v{D7`umyaxMX%640FCi*{-vE$6V~%@AmiS znK+C<(!Ze}KmG+Ls)Lg0DX%OOIjEF=331&|pXK++IQ*KwA60`P^xCysZGA$tGtp9I zBC>6R z^{+{!S8XtSOQhD)3%hv0Km-ON#ULh0Fc^~9GmykY38s)lAQEz}1S>>x77U(ez}`Y8 z;9LUEN)}4U1F-hd$fS4IV8F_P%F$&t6v;lK|GTiuh#!f&*(bkFSv-fqE<-k=-quXe z@@>hrLQu-b)%z22X`QBy*zH65w>0penIqqHccHeByC2{1Ni)6QmjxXkLnWzI9yofW)Fli5s14O7at3jeLDqAMSph-_0e`+Vps zv`*SwN5DE1vExIXRy_q38=#+qdg=CK4Ou9n?cHa05#Bd+0Kglm)j1+zG|KWi^wTL7mT18P9pD4i57x zbbnBH8_?^az)-w5i7y!?th=ZGKWg`@R;#zg0^g(}SV3c68Pj$((o|$6CHlsbLw}>0v#$3|Ycnr{@Lq#q7sE zJh&>F>hkOPvekGPdrs+p&FY5LVLh0~Qc89PJU>D2qPK^W3!8POwy;R6sn}cN`91Eg zdyuP5@w|tIF3ad=%E(`scJ8Eb zBP4Eu_dxNw<+T91U(sl=Z3gIbiZ*26KQ)rPOz#+(-YP`R%KSB`%5a5J{WjeH5VT*( ze}MiOplmK8KC#9{#pJJAn)kW@%r-dbwI7IWPBOWa-TkBoAnKXmS#H@{TVF6 z1zIi4cMkVZh03F2p(!w1Z0Eikm{q0wqk3;$QhmR`J^FN=)~~V0-vI4Wvu>kY^OVi& zRyrz*`yY8TLhFnjf!|~ODPU~Tmixn~tR5=oGaAuN}iTfzSDF+4yCYy&W zCStujreeKZ4=Y&3A4)Jtv4}HD6>u2HTx4S4HjrW9e!#HtN;D&5$7BO0X~hnpJ`EuT z21Xz)3&b0M*Z|7c1+pJZ&S8>gl$hMZbh^HRfq@;Q4g_kD*bPYR79{o>B=#Kyn^Ay) zfg5TLqX?3C2?GN!OdMzzAB+vOiyz1ax(et{pk)FuiI&MPn45tf$zf4uOqe`@MV)ca em>dBl|4eRR6#)Papi4#o delta 454 zcmZ3$J%xLMa=i`%0|PUI36Nx9&|u(X;J7ULfZ-Wyl5wK(b5=zrcYy{GL8ks+g%xfB z{a=eEE(tO|} z_(KT>DHd@?sR9lInTt#e+y*iX+z%KSI5$3sW@N0GY{Mk2SOL_lBgDYK2&6#>za@kb}f7Kw_65u@@k*FCf^AEDQ|XP;(eLki>!J z^TNb|=JUbWK=b*5Y@n-v?gUyO0F$Vg{Drxhv1W1wi!x)#=DIM_X||y<0||y>DIM_Y) + if (x<0||x>=DIM_X||y<0||y>=DIM_Y) return 0; return &map[y][x].item; } diff --git a/src/map.h b/src/map.h index f956f8b..210cbcf 100644 --- a/src/map.h +++ b/src/map.h @@ -9,9 +9,9 @@ extern const int dim_y; typedef enum { - EARTH = 0, - WATER = 1, - MOUNTAIN + EARTH = 0, + WATER = 1, + MOUNTAIN = 2 } map_terrain;