From e6ed0940956446dbe26af497eb5adde7166bf35a Mon Sep 17 00:00:00 2001 From: Milang Date: Tue, 4 Feb 2020 20:34:30 +0100 Subject: [PATCH] add specific comportement when a plateform is could pass trough mario --- SuperCbr.g1a | Bin 63704 -> 63784 bytes src/plateforme.c | 23 ++++++++++++----------- 2 files changed, 12 insertions(+), 11 deletions(-) diff --git a/SuperCbr.g1a b/SuperCbr.g1a index 0fa002b788a1d15537e21122acbdfb0bdf2813a3..7b6165856dece4bd4ee1e8666d50f4d5f589908f 100644 GIT binary patch delta 3414 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 delta 3284 zcmZ8j4@{Kj8Gqh8ltU1&Cn!+V6R--L^5U^d)!9Sbii+i|C}64bZ%E;sOiv-LaEFEF z)}eqeS%@`Rlac1qk%)e-F)d3-Bn!!KITRa~Xr-xAhOT#&Q(3~se(!yt-i|zc@ALof z`+T4Kv3B$)ZS)sCf4S7|x^OmP){DRK|IW^au07TfZPuj!?D8%*(@c*lepb#LT{?Z3 zk%*NLf13FKr@)Ut>v}-7FV5`6nJCPt(@WM*hl&0LJt7x9y+gdbi+DvV@zQ?cWp3h) zKH?51@kJgL%;3v&d0}3{ccBj7re$ZBD&J`T9kL*XxbKcKqPwJ7oFR1r_PL`|w1=k! zD82I(Whi_ZJFtEPxK5|n_7Pw1$GMkyHN2VYiEr2nI`9of;)NdYLXaWk;{3!-h^iom zcxo$Tt`W})Azm{;OSW4eAEjh24rS{jpr#|f5#|OyBi`d7J~>Eyu$%bhTH+63_JBz> zlVMV9k%FZo=8QSDzvrs#e5h%MU?!6|A0wXLIRHU$zsEnNW4& zcMzBQGEzjhve`*I9Jb=E#J_|4xMJAjz+ro%3wRaqJAxZ_8DtTpIXA?mIwEW}yvo+d zs*b=4EIS?nW{5js!H|z=4a7f!${C+Bv~+1mG(?>x#Mj5;iJ-&ViCav!IlEA>NWie7_ZEIH`{y-UPheH%89#(ri!2k$n~Al}m4H>zF0=6r(UT zJ!iMj#a>E>v<^NBJ!;`((V7r>6JltpB3_5qV?YDh)RD|cOvF}eETc+(+y%C6zRpiF z(CH|M+VMo7O*TAZ@RYb7AcH!s7H4o~zP7>?U&pLUcl>K?Wnfm4)LAk6<&3COa*oXP zVq(R(VIvgH95q3Wj55A!%Gk;p78XT35n*qf5&6d5j$&(8Q?7M8g*WX<`?xAQ?f3Qi zw9nJNO#5rvH)-Q}2`#z*NG#Jfx0ZL5Mx>k4H??UUkIac@b(5^Qvm}CV<%x@u(?eNu zN^DDqJ?7WimaNAAlxkbDo2Hu2-CbtWHn*i2_Jr4HQ`~14mp6f)PBt{3GwRw{$={skn%e@Wubpkeb1*8B!qhBf%=Jm4clCwH`OE@Y zxs<{LGecck6K`o57bRqBGCbOEYpmX_dIFPtgf zXteK44xkW_30Mb+5zVOu3)~o^VlkHbYz-!I{5;6f@Pgm|_IHv#rG+ePjAOUx>a8_cV9MAxn8`c>lZ*JGH6upg?1 zSyt+OtS`AM6#IrxS!|$jCs7GX1$W-Worw-_^sko@amRqBF7gr59& zH2Zo*(*8u|5;^-<;eXZs#8_8ef+xf=lXlz^eq_oKlJ^>g2R5Zk>E1uZl5H;X)3Ejj z{kWyVFs#W+eSk@pG~%|aaq3*aNbp-d{!h&{id<KA5zBn;Wb2* zE59^cG=?ve?*XV4KLJOjeiz-7Un`@-8jtq2){sDxJrdGNu>q z69r6v-u_4Iwr=~o%zFOhhbyq$7NME;+F{M=?Q$Gs`$5C7+G|DE$saZLUg0|RmJI4- zzZf}nC_#2ZzG-Dg3QC4G>KM)G!PY6K$gkTKDc^(A^eHFt!xN&XE+s*}WS_)?Y?WI` z8XRULs!v`DUR|LwUAJ5t244-B^M*Jj=EGFY3smGb9F^OIVtM6njiSF{rMS~DDa$k1 zSim}k(UBO2jg22a>hI`?HFKXI(^5$MNPB>cFH9Fb!vs_|gBGERdatR^BDgJz@92nL z#h<9s+!jBl#-N6wvZ3_0T4l(wMB~T>OFIW}c&h?u>0A%M`n*v)hf5mpdxdz0%mMJr zrkD6q-x7@9Z4Jh6NPp7ST!Id_JDBk2A>h*aoWMWV1@mwA{U2T*jNcm!#%}<9?hpar zvb.x+p->b.w && mario.p.x>=p->b.x) || (mario.p.x+mario.p.wb.x+p->b.w && mario.p.x+mario.p.w>=p->b.x); - int yc = (mario.p.y-3==p->b.y); - - /*if (p->type==P_FALLING) + // Si mario et la plateforme vont se chevaucher, la plateforme est immobilisée { - if (p->v) - p->v++; - p->b.y+=p->v/2; - }*/ + box_t b = p->b; + b.x+=b.vx; + b.y+=b.vy; + int x_collide= (mario.p.x<=b.x && b.xb; box_move(&p->b); - + // Si mario est sur la plateforme, il bouge avec - if (xc&&yc) + if (((mario.p.xb.x+p->b.w && mario.p.x>=p->b.x) || (mario.p.x+mario.p.wb.x+p->b.w && mario.p.x+mario.p.w>=p->b.x)) && (mario.p.y-3==p->b.y)) { box_t mario_clone=mario.p; mario_clone.vx=temp.vx;