From 86286e4b29d1dc88ee59556aa2b61c7811d6afa6 Mon Sep 17 00:00:00 2001 From: Milang Date: Fri, 13 Mar 2020 13:10:01 +0100 Subject: [PATCH] new brick behaviour when destroying --- SuperCbr.g1a | Bin 63880 -> 64000 bytes assets-fx/img/brick.png | Bin 4466 -> 647 bytes src/bonus.c | 25 ++++++++++++------------- src/mario.c | 6 +++++- src/world.c | 6 +++++- 5 files changed, 22 insertions(+), 15 deletions(-) diff --git a/SuperCbr.g1a b/SuperCbr.g1a index 3e24417dbba4423f737bd4979ff1847469395ac8..eaaeb31defac424e81fd2ce1b1a55994d2f01c45 100644 GIT binary patch delta 3839 zcmZ8keNdFg8Q*>1gWP$C9B>FU5RQ)!6jPUvMvNaE(JE0!E-L0sGvw;yp&4k^%I%y@^kIfHE64wuX`a_=(1Jj$u(Ci0s}`u-6oS{f*ftF z$ayhTnpYi4)-hB6=bkq^zZWBAFzUCA)BdT9%zZpFw_WFt6I%VZh~cKWe>5}R9}CB{ z|0`k;7KpJrBu|I;g~itqwt5czBEn1-w1O`utVC}H7&{2dzl7FKm~DU`j=7Zrm=XcA z%|}>^2ZWIp7f9g;R)0Xt)rHj?!Z%3;S(p5)sfqV!S}{a=Y%8W2o#=-{L~9mtaF({XJ3!dP03S^L4=v|6QZ~{7bpc-ysfaS=D*OO} z61}?PLAR7v4i?t8HM{2GTf@36+7z9& zK-fVu_gM=wrV07f4tv>zz2qRwI!M^bGCwWNn?U-b@8j7S`!bJM{81H|Vk>>RNn$fj zm=#k+4gpVC2G;%Dg8J)>_vpiIu#`*K5d{8soDm1CePcxn;4-i|Ne3`i#2s1nap4|< zYy>($sXo91S$pDqn$9Fb*L2h^*$>g2@R?`?7#?VJgD!za2n(;{Ci<}8NmV@$%Mu+? z+aCFh(h*+1wl{pnn&G_c0%6TXSl$kdXbO4ul7(I(9N@m z14h^3KxM=EWLUNxtyN`(S8%Kdi=T(cp`jzvJzl6Fbma1Ukxt4zp6QuZss>}*>BVb< z!2tDSOvzQ5N}9vvpLpmXy$~UE1EsLx^z)@Igw+BBcaYNEKPsAHkP_u>awsHM9gjzhFBf9ZKbv z(%sTQv#OMSMK^U};$aQd44^FXt}s{RCJaUDn+8r4A(CcDe~KC$=!(afc+AS zYh@ra;^@)}POBCDAXy}_kOS8i%xMXL20&Lq7dO1I;hh(^`_ec3t|HTBd}+T`UoCf} zkL!F7zVNP42~@-Kj|MmCinkioC<7FA=%@j>cGxe z`e=hF?H)oN(DHKoFkvwVP!V*5C7|6jDvqMISqH!43%mAb0Kg@nOxTfxAdIyEL>sEd zVN~Tg?kfA0l(q1OCktrwYq0aGMJ?W)PUBFKo?Ndt>tId?rQJ?mz31Ee(x4a-Qq@`h z9!(UJF)6HYe~5eRNowBSVkr$n2bb*KA4WNtBWy;mdhDGM3z{pt` zGnYrBF6`Sy=}o@l!1Y!8kr84RVl-For!MZS%%Wx7TbYh;Pi0n0Sw*H#=U&)w%4R%q z*R5MB`jutsMCDz&cDD6V%6t4m}?;tldS=)QG!CEq*4Q(jnFHY&)fGeBy8xzWO64Xc2cE z*^F=BkttOB?&mhs3Dx&pKV6FiHz2_csDjVpLRy8zuQDwzB463d-9C!@D{mq_d}sA2 z^;8s1Q9NfRwBU{-k!NsXXB;3zFyjGbIPi{ zE%3Tyx1t8b%aA*&n)WuC@o)s&#NgzkFyus3CnFw|0npbVAjj(7!lQE7OKypW=7?YN z$zRB}JZHSXG&G`(SDDpp=hqUQSM?`)rFExGFbM>k>}X+LyieV5H+LA*;i@T!q=)Gy zpE~*?64jL~5|vv{PSFc|;pA(;yrE`K%(RAi&3b`3_tor`YE9f)yG=Ao?M*al(aW7O zy{X=KC5y&j+N&@c!g+8ts&l6jC=GIb-P8Cgb-zUo;=0q%QpT0juca~IZz1fo-7jT4 z5h;EK$N=DJJD)#&hj#JlGrPpw_{>FKRR4SiwnPuK#I`uBeo4zLkx81RdWC;jzbB?^ zi6cxI4}|{dQ!TBY933TH z@m%S(kgzH_Q4$zI+@kA^d1>QihP;i_jQaq4jBmn$b3M|FuMQ{IYLnv@09g zzgzt%csKfm8-$g2VR+?F$e3Lqv+~FG+6dcczb|Bay2E`TU;3@+&$>`?T--c=Tsmr2 I8|KaQ|F%LEk^lez delta 3716 zcmZ8jeNa@_6+d@(A&a}f@+DAL-325VOt=b0RFox9B}!$ZAdq0Pk&PI|grr1v8f8}? znN5^{y-vnS{KGbkA%q$2yiCiqWV%&n>K|mvwj`wq9oGbuPHbE%gS4Tgzq@Zy$nKnX z?>YC}^YOdqp7%UcTJK$LQg7d<7rVUgbr|RF;Q#pl=H?=se}6h@op$Z|$A7h>hiU%p zRi;=SbC>E(QJjdGh~LW}w~+edGo|Cy_+ZW+%!#77-Xxd)l|%F$C+zmp^eAy>8Sxiv z#P>H5ud5~QCQuh~14c<}?ds?>mZ#l#$Q|6Uv?D?JLc2O5VvzXcsG^IytcgE5Avc8_ zaCbN6J~3i=EG8r#nHP&h<2v`q#+-K@trmTUqdd*4>(n{h{OiYcMTRDwKW}(_k%6Kd ztvA?y?W_M?x3rUa*~$3!w=MdU582x-`pz8=LqKzbdEQP*e51`4*P**f{?+4DWEi8r zWesJ0zRG5B3fNxvHG97GmASQo;?18ZP07h@J&d_;6ZhzeUry1Rw6?*)!Ovv) z58}I$g*7+9-0fH zzzU73<(OIG+nmbCa>1f8l>ww&lgq-j@+7+^be2MPOq5t!A~STvE62n&ORjZ*=!zZo zGKe2qL)2in7O0@tAiDvvs$oc0x2-m&pvD9a6fi@3U3a*nv-BA#4Je4k#})0^X9d7mCwlmUl)36U5{-x=4f?is_V?oskGR zjEWLfp#@eq7r+vz4X5ZDfMN#mcWz58Fvq&fhw&Wo_xc0mse8V7NLRndS$81eb8R!T zWgle{kxD0Y%t~T*GJ6U)Q>OHY9$?7yMkQcK9xi0Hk_}+MMGdxWmsN~pw!uXq+*gfa zy%dE!MZCd9u}?_d6y?|&p?RuW#b(Pe@juNF55mNqK@hgzF%$ppDzJc=d91G>11;8N zWYc-Xw?JnzbP524JckoL#gX#?`!N!PC;rs{BA!*Z*!u2oThZXD%6OY%27nqdFN%Q{UDyEBG~9rqu@Ik96cJefile0y&{OjBb2CI-G*+1}6fdeNz?tQjBi;B7A$4{>|4lQPH=Y3Yh%uvIq$w$ zJd}`gp*+oIIJC#2Kd9|61$0BPFMOcBK{}%X%;9kuy^)o*o_&zG5eO&X=4|o;6clBV15I>RoGX1tlc7`AJh_fV{tO0P6N+=kN*0H{ z@+68-cN>J0>P~eXa%lQOL&qepBua>86^3|d^pI*t>d8PfClZ;gh)4p^(^Y+yXW~8aEOhQEqiQb=*2YbXlAkr%4Rs(payr~ z6F`X~4x(U!Q;;LNU?0X)ptB%AJ&EF;ysF-jpbztE5C@q-C7^b3e*g7|F1&h3wAZyf zc07PjKPa|H!1_a{L9!DWzz0CzfB+qDa^SPDM{wt|2ss;5?9OjAY*5Lo@6|lg6u{;@ z7_ngF>bGQzl%c$v5M7H8R zS@-PNp#$|ru@1$s=;y`H^*75T@HM5OWqZ&}2p<157A@oxc6e@hiB6()CjROr=! zYUw$BIyIM1P7$w1`UguSy!d&&bPp$859{^5kc0>O)v*St)m%D#I%y@J4oUE`8&W64 zu&o;x1Bf2UPzKz4HSV!9Sks0H@)4;jy_-Oc_?H=BUdq7tN?sQx@SpZzE_K5ZPx!*~ zFyG@{%zu1!5%1<7*%t};z!>-i273dG*ZcAo^B?_S{km`Q`o|Lscm({1;6fhfIUya& zXeB}6BZq diff --git a/assets-fx/img/brick.png b/assets-fx/img/brick.png index 12451b7ce97716c905a4ee35450930efdc5e59ee..737dcf9bb6f99e36654ac03836961c2c9cc82dbe 100755 GIT binary patch delta 555 zcmV+`0@VHTB8LT#83+ad004=A^hlF24;6nXk$sUpNW(xJ#a~;cDlHxCAjKg=b+RBT z;;2<9LWNK(wCZ4T=@&FvPo^e3cEF+Uj3c38M5PU@dVe})0h{Q~NP88Gd9AEeF@%1jjv%G)L z{W-!)!DN6>Af9EqVG(Z-Pj6Z}=Y8TRD@zLTIq{f57bJeH9AokXv!XlO+LV%1qDyYIj zf>wy{D6t!4Mt^SGOz#u002ovPDHLkV1hqm_yPa` delta 4428 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 bonusSet(BONUS_STAR,((mario.p.x+mario.p.w/2)/8)*8,mario.p.y+mario.p.h+8); break; } } - else if (c->content==0 && mario.size==M_BIG && c->type==BRICK) c->state=c->time_hit_id=1; + else if (c->content==0 && mario.size==M_BIG && c->type==BRICK) + { + c->state=c->time_hit_id=1; + mario.p.vy=3; + } else if (c->content==0 && c->type==BRICK) c->time_hit_id=1; } } diff --git a/src/world.c b/src/world.c index 24901c2..d9ad47a 100755 --- a/src/world.c +++ b/src/world.c @@ -136,7 +136,11 @@ int worldGetCellCategory(int x, int y) switch (c->type) { - case TUYAU: case GIFT: case BRICK: case EARTH: case BLOC: case ARBRE: + case BRICK: + if (((brick_t*)c)->content==0 && ((brick_t*)c)->time_hit_id && ((brick_t*)c)->state) return CTG_EMPTY; + + // fall through + case TUYAU: case GIFT: case EARTH: case BLOC: case ARBRE: return CTG_SOIL; default: