From de30485e46c46d4ab92e7b6afcbcde9d1910f430 Mon Sep 17 00:00:00 2001 From: Milang Date: Sun, 16 Feb 2020 15:20:35 +0100 Subject: [PATCH] add left animation for pipes --- SuperCbr.g1a | Bin 64216 -> 64280 bytes src/keyboard.c | 3 +-- src/mario.c | 1 - src/score.c | 1 + src/tuyau.c | 27 ++++++++++++++++++--------- 5 files changed, 20 insertions(+), 12 deletions(-) diff --git a/SuperCbr.g1a b/SuperCbr.g1a index 78c98ec216dc469ec51e45f927344249ade5d7a1..eb55acc379db88932444a8b8b22f86d4b9a88244 100644 GIT binary patch delta 3697 zcmZ8keNdA}8sB{rG!PI(p=wb=fHoB>E1-=9*zSKO{PCJlE*!^(jn(neRvp@(1 z4X}DGVf6;yrB90hw%$B}RR;B|Xha)f>DfSmlxyOd5kJf{6V})ZI1ac7=vLT_+Zx)# z=R`N5?To%3B3PQ0`_!eWF)D7wgdMe`0)Gw+)>1`B;pe;|demdV%%Axv)L zbqjt9f!}L-l)Csxi8^?5Lb}nBM9Ad=ti(Xro@0b1G!y3V_~^=%K?Iwy%5d&a*g&gz zrZGPRcHoZJ_0Db0NvS_2un^S%!B>fNHc>;jUh?TIrVu9cn+bx3k*9tWyg#Aar zt$^>#L0=9&5!l9T<#F06`l~*np0KaYgr#^@k=!WNZHO)KxPk8y2};;!6>u>XDmu`E zf5mFxwdhBIsGRZBeH*!nrw}A7$f|R4sOZZLwl49 znaJk~p1E}6Q`ll+LyT4*e%3Q&iDAtx@$R9kf8rl3T~1GP|I+xfyCl>z#G222>mD+B z57U#9?UZNetKU^C=(PBS_*6QtnMfB>iYro0Wlh8u}d1i}dhvsVgO=?W{ z3>kDyBvl${vw*9=b-QF-*58`WT6McMSC4Sp3-OVjAg*y7*T9be=M3VUtip*@j@HGb+wQoHZ$Y-rzY+-*zr zMzyZ+8f@j?M)pLugc^4TBHxTO&JBzh=K7WzQda6sQdvX$tGv(r{PV+>7|+mpyS{@@LQb+JH*{+^I zxlQR__9>MP$lQ^2Dp-}a^4ZxNX(@MPU#AYmvOG!B`evlP!!5FfJ9291c|Mr4JZIXm z&@$s2)EMmx*$zlB`a)Kw;Gp!7P-xyH3K9Uxonue39F}}ikctfyhbhOdw8@Ed3C@gW ztD3ALw;O{ZLLB2F^cDb;Q=FIYJrmi;@2osXo!p+Ak?a7yBJG{D_tH+M{Wv+OL=WGZama4deNJ)@BKEl*3A_3_aLUCaFPQCo&rYF*@| z1Li{k?82?`a9biIrZ+|VmaN1I3r0)s$vR&~o{oiQU93NOQ0sS*g&(if*Pp7R=elcW zuh$QfTf~C4KV=mJ`WLR!r=^#Vit(X9)!4cI`atW`iRSADi_YBa87vRj!ZUOk?;ie# zDw!uFa6bVIbN8C!X+l}HUAeI)kO<-J_P#O%@)v zc2_85GeONg&zsjO$WnP-I-OPr6$c6wXWjxDE$)bQUR{*-0pKxVd6#&X_4{AYj|EAf zmCp6=(^$ctXB`*$nZ_>_KBer*H%s$D`dQ=8WEAgiz$N8U;gJaysx{Se(5ijI7m$8NKo%bRb9 z`c+ExR?fEUiWr~mt0D}T&MiA7T=U^2r8BnU`Vg;x5~P8{qc}?zP|0ReI<_`Z>gP$N ziD)gQyJ#CfUz&w>xO7O`mdUSedr{gZD^a#q!FHnT>4?5QdW*;@gYksfHYq)2HT2bC z_0W$VS6!(wvA%<@7+Lu5dia}h~B6lfGralcy9z_FTe({0;&NQ__6YD zLO^lbxYO=hFXJ(Ii7=N9Ha-c)mk{uV^?8Y(c*#uw!o>DLzdg!JzQO$AfKTeve4&w3 z?9n2C4+qBSR%P{$n-VQjOciIP=Pb~e3C(WwOnq{?WsJ9i8y>n1xE-O{O_V3EWzdi! zk(NBuahneCxXJ?}z8#h8X5h6IjBjOyh%XJE@6AE$-rG+tO3~{_G)NF-@XbUT zfz=+!#uEVW#wW_`>S!vxmC8-~ibdz%cM4Cqr2Qpm-TM#DM_mkq*8R;sDIs^f^r9?> zwFw-bQ*#$7rgN?lp4HsoMb2#r*bp74;_R(b@1^N3tAVif z!(f~G2^@PxUB_e!%SY~PnAl3Fw2Gji2Y%w4GQMxZKQa?YLYEAn$TqPKVtsv=VLPw< NaSOF7JwHa#{{hk3LH_^% delta 3614 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 score_add_coin(); - score_add(200); } else if (c->content==2 && c->number) { diff --git a/src/score.c b/src/score.c index 2e7d58c..a2564a8 100644 --- a/src/score.c +++ b/src/score.c @@ -64,6 +64,7 @@ void score_add_coin() { pieces++; time_last_piece=time_id; + score_add(200); } void score_add(int i) diff --git a/src/tuyau.c b/src/tuyau.c index ceb0d95..b26268f 100644 --- a/src/tuyau.c +++ b/src/tuyau.c @@ -15,9 +15,9 @@ void set_teleporteurs(teleport_t const * const t, int const n) if (t) { if (n>6) - nombre_teleporteurs=6; + nombre_teleporteurs=6; else - nombre_teleporteurs=n; + nombre_teleporteurs=n; if (nombre_teleporteurs) { memcpy(teleporteurs, t, sizeof(teleport_t)*n); @@ -33,11 +33,7 @@ void teleport_active() teleport_t const t = teleporteurs[i]; if ((t.x==mario.p.x/8) && (t.y*8==mario.p.y || t.y*8==mario.p.y+mario.p.h)) { - if (t.key>=0) - { - if (!mkb_getstate(t.key)) - continue; - } + if (!mkb_getstate(t.key)) continue; // Animation section if (t.key==MK_DOWN) @@ -66,9 +62,22 @@ void teleport_active() } } + if (t.key==MK_LEFT) + { + while (mario.p.x+mario.p.w>=8*t.x) + { + dclear(C_WHITE); + world_draw(0,0); + dupdate(); + wait_next_frame(); // 10 fps + wait_next_frame(); + mario.p.x--; + } + } + ResetMarioJump(); - mario.p.x=t.tx*8+4; mario.p.y=t.ty*8; - mario.p.vx=0; mario.p.vy=0; + mario.p.x=t.tx*8+4; mario.p.y=t.ty*8; // Move Mario + mario.p.vx=0; mario.p.vy=0; // Disables every move of mario camera_adjust(); } }