From d722c2604d25ae48ed32229aabfacb19dce770ba Mon Sep 17 00:00:00 2001 From: KikooDX Date: Wed, 19 Feb 2020 10:51:07 +0100 Subject: [PATCH] Frame precise timer. --- include/draw.h | 2 +- platform.g3a | Bin 67264 -> 67236 bytes src/draw.c | 6 ++---- src/main.c | 2 +- 4 files changed, 4 insertions(+), 6 deletions(-) diff --git a/include/draw.h b/include/draw.h index c8119b6..0d98305 100644 --- a/include/draw.h +++ b/include/draw.h @@ -3,4 +3,4 @@ void draw_level(char level[], char upgrades[], unsigned int step); void draw_level_anims(char level[], char upgrades[], unsigned int step); void erase_tile(int x, int y, char level[]); void draw_upgrade_message(char item); -void draw_timer(unsigned int step, char force); //coucou Lephé' +void draw_timer(unsigned int step); //coucou Lephé' diff --git a/platform.g3a b/platform.g3a index d136230d985a2b2bf3b1213f71256a1ea3efe553..22721fb36cd88faf3875ab9ec8e35ffd4df2ecd6 100644 GIT binary patch delta 2675 zcmZWr3s6+&6+ZtyfOS!M?XoM><>6x$(*3Jw)oh2|;A2}*d|;r_sc3dlBe7z@C%Pn< zWFxzP{L4edgbYkHx+Bb7qS%DWj7)1g%=B)JXxcnhc}R?%sEbHbMtknPB2Igmv;XzfHwdXSsEP=RNDwN$_{i@1X4H9kQow9>X+82{>|%(rdn0EA6Qijl0Bq| z+#>8k(J5si&`K|tx4S|{e5}9tEu!P{N><2-i#6@t;Pe4~2d(L{Oz&;WFxB;g>67ol zbm1io7>=uFsy3q`@ z_z2K^C z>rXr6{D#fJB6{PsK`=#GFi!t(g=hmIx4{r{3k-AEhX*zDe+1Q*W_{Fd;{WwwVwhXd zCwcigQ}pwjtNaY)2W7d`tR$;T;NX!@Ulu z9?LR)8@@B8>3=ycJSTAP0=oRFMIqoaVvtANiUj04a779k_H+gSQ&1Q*eCHtKJY=g6 zWs)$~cxe4(GpKq`-DqeX0#)lm?#ZDFLL%8w=cVnt1Vwb*BpF=RHQ_L$BRwEGvkQ*X zF$#-Oa-ROx@#CnIH@#!cy{@T0U}7PqUE-M#$as>Wp8!?0AdL#aGhbPSQcRySznw{x z-NKY$?ssyn@n|#;O;EQMz^#>Iep$R*tHd=n729>xt$B*_m{GrsmtU7#QtVNn686%0 zR0KDpTrGEEH!EYLe)muuY1Kg8X-MePeFO=w){}!On5_rhdGe7kGY?+1rwj=(o(7~w zq!y%hq<$PrF;Ac@0at-+NNA(76lJJii6s$A81toywx z63^wlA4f<&+vQ66g?n|-FTYAEz%R3=NU%7xInC{tJ67`YrN)_=y<(D54#}ge$Mu~) z+%LZaynF!ah2wx4_@Hkx#-GLmT>wawwIBU6X=J4pDWs7*Qz0iLmHFK1lfRbw zEe^p+E!?QPhREV?GIwQ?u(VZf#bK+fdYQPmoT?47#4x;JJ67U8u9)h|HeB(FS7O6x z(bdXo#vl7pX$ER`vF@5dS<)!;vA57wf_Hhyl6yd3PUQ-{p@eu@aqVT2#nS46`Ybep zrH%Qr9cvC$f+4hpS?YJ-%=gu25GD4#*~JYvOeay1-vXWO#Z-lYrU5nfuo)-rPKeWl zBSFk1oIF9a0^EqT6;&qA_{MD6&rtl_+Vdlz4BLb4VtivP`{hX^ckrX^aWj%f$-C$| z&~!x;kLV+U#)~m=9Um_zvdC|1ny;v;rTL11_B5}R&AZ7GT9Omn0KdrDNxafIX4+D) z?z+OF-Wn9XKH{LJ^V^tRKp{ebh~58tD%_Rua7`@>KRv4?kuz39fMr^w>-%q;o&OggUw*n>aD z)Ld59Tvl+(%Reo1V%yp`0xiD>^gs*HZG}L8hl-^>pj+_0e;@NL!ypUnKug>}^HPBx zRRDc=80fx6-&C|rD?3Db<{9W5#LOKX-#%Xj88wY3|4cj=SDJbTDD9X4&KVPVK|cN< VUw=kPmdK)q>-&}DAF|IM{TGS=O!)u+ delta 2633 zcmZWreNaX0l^v4En+%2cNYOpsRE6$^e2*UV`{ManmO!*} z64rIfHY|I23Adi?oXKn?oa=o4y%J}?Dk7;6Bf5arPYxPFu?C>0I|pHxv=KesKS-u! z08*%m5FO9_1W-Q-6h#_s0UFy4G|B^XEkzmt8a7uVjY{ItGm1A>%rdL*jF{DnQ@o^t z+$QXD#d#&h)cU!i-8C}O%LXdnB_^(@YPF2`nQ!kFbuZ8(L7?%KtY_aXbtOuuIn1-> z{TrRVwzclJY7~MZpg1izrw^%5sbi&H*rfb{~wFzXjtT%eNZ?#vx(;y5#e(nl;XezooA5e7w?D?cU>k@%A1X z=bi0N@h&Q9a?^mpo9bxVAF(u8C(GgwMBInEe+?2L(SBV7erNpc@$&JV<8O_>Ic`ob z8+RYByI;&onkohZQM-rrk;Y_4N}k3Z9f)+S``)LtjszkcO?Fl_TsfGh*&osNm!-jC zhR)&tT0m1=whmJPutLHN{7HP zY9Fo2Fl#Dvh3(I-is}b}w++DSr;CqPkcQvsVoe&|1&5s9T0B}ozu7Vb#wZhZL3my4 zMKJ6R=)-PXIg1)NUfYdYI@Jmfn?6`tw6Lc{`d)k8WzTHkdX424T%0 zm^JphLarI7LRhW4VAkl4@vH6~-t=SXsQsu(vnSV}I!^j?{+{!-Wnj-QHTt9tBlRW7 z$@-C!=$BNBpiZWr@B3;9_!ajcu);c4V$y8-!4z31vyS=xvEdQFwDkIpTcS>{u*>-+ z=#=S*Hfi+Q4UbIPI)y%sr%sTInbnj)QzEhGy9?VB8K~=rt0c} z&N+!M-oflYe3k)g^hVTgMj%e^jiMv5U|uk1tg4B z9@;c>8K?v2zd6%34C=PUT;Na*A+uPC^Y@EI2!s#!N!zUqPQ&H&Wd}o0)go**=3q*b zpjn|SL5F}-#e{!`1qCs2OlppwRl91GF0o85=GS>dIUrss%zk8Zk_E$y5RiIe0X(sC z0Gj{M6RSiXXT{6M!1|9QC`BoYn>?bCJKKROW2E=in~yggX6q?L+K1#rx(U>~3*UxB zg~a1c1xWN~a2b#5JM6M+JEgsR2P|PM6#gFqhfwg4|KS z%Pnd1@&a;Gx;;v&VXlESyZ@=n6y*1Smk&Y%5p58Ztf`so-0{0JeLyoG0$q%GE-qxA z6MrJz%vzI9x;a;koDeIk_GHhTlqM(vU-aag9Pjy%$X)TSpFqD#mPc{hu1+=*WW)r~nsi49ra!reSG zheSn%0iEB8rBb9!plM@l@}qC3)tRD6RC5z&&yrZtJ}6mR zO(~?0B{u8vb9u8U+nVD@ALnZRg z-7HgL?{mwzvM=OQ;x7LuGBV5}xI8uX(1cxGlgRAPuDA|vl!(SPiHJGO+P~Z;wmUzK z?Yg}2|D>)jr*wuZC&I*#+#cq?Qb)EjQ^yrD$xU=@Q{Z$IUENF`GXK>rk=+3J(}J>A zaTIWFeQZ6^ZKk!nv^FdcaR9d`HntO}-ip*C*;r8GujJzF_)sqM#K!Fcy0jdrSF+VU z@l9+6nkeqAollwc(}vD15BUJ7FbHvnU41}HT|lc^fEMKfJz)TPECT4hj@DVYC#~%b(GyId z3$T=Q!_@LA7j@J)RrVA0LgX}q2TFs}jtl38WKlo$pxo$Dl2>FgiH$u<@>ki7o&N>8 CAViY@ diff --git a/src/draw.c b/src/draw.c index 751eafa..6d27df6 100644 --- a/src/draw.c +++ b/src/draw.c @@ -68,7 +68,6 @@ void draw_level(char level[], char upgrades[], unsigned int step) } i++; } - draw_timer(step, 1); } void draw_level_anims(char level[], char upgrades[], unsigned int step) @@ -130,8 +129,7 @@ void draw_upgrade_message(char item) } } -void draw_timer(unsigned int step, char force) +void draw_timer(unsigned int step) { - if (!(step%60) || force) - dprint(0, 0, C_WHITE, C_BLACK, "%u", step/60); + dprint(0, 0, C_WHITE, C_BLACK, "%u.%02u", step/60, step%60); } diff --git a/src/main.c b/src/main.c index d2d8b68..dce625b 100644 --- a/src/main.c +++ b/src/main.c @@ -70,7 +70,7 @@ int main(void) step++; draw_level_anims(level, upgrades, step); draw_player(old_x, old_y, player_x, player_y); - draw_timer(step, 0); + draw_timer(step); dupdate(); old_y = player_y; old_x = player_x;