From 9b4447ad243ef60145142060f3d7749b43b0bce0 Mon Sep 17 00:00:00 2001 From: KikooDX Date: Tue, 18 Feb 2020 12:38:12 +0100 Subject: [PATCH] Base of speedrun timer --- include/draw.h | 1 + platform.g3a | Bin 67196 -> 67296 bytes src/draw.c | 6 ++++++ src/main.c | 3 ++- 4 files changed, 9 insertions(+), 1 deletion(-) diff --git a/include/draw.h b/include/draw.h index 99da592..88e1c9a 100644 --- a/include/draw.h +++ b/include/draw.h @@ -3,3 +3,4 @@ void draw_level(char level[], char upgrades[]); 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); //coucou Lephé' diff --git a/platform.g3a b/platform.g3a index 62592125b77f59beb95e8330c4207eb703ca0c94..f964e9e48cd284d5ddc2288dffadc2d9d82e953a 100644 GIT binary patch delta 2566 zcmZWr4^Wfm8Gqg{2_^=WzkvXn@J9$jk5|PWRW_2sAZ;y#KWbLJiI_mvu^n1aYpqGe z+9(MiZ@@ouy;!)Zl~cFRTCRs1cX~Ir>)pQ8PT7w3q66VJw0NP8c3j=_3G0u)&qYXzzq0UF~6T5bVaAqN_fAwi8gA|I>YQN3%KNpF z+x7u%9s*j6{9b_#?|Y&`E^!j*!D%MEUG1E#EqA}!CJ)GO%e!T!oUxyP8dTs$gzXy# z0!zMFDo?0LBS|KONwGT9yVN-wSbXolw---9e*8E`7MotsMF*65F#)AXJ;phe6`7)s zhYufqBQGf_al73|0iHaOl1-#t**l6?>%AIV_3A8d1gqL_(NrjbMq_0xc&w^npf%@# zZg#VQ{W;D%zB@&Uzy90LLwCvB25pSXR~vi$ulA6ur#4+1*J3{Y7j3#WK43SgT_*x| zd&m}Q$u+5)&4HcwVPR$Ujf1d#4BqJ8(YlND{7$PeswUzT5b6jd4o}HkNr_(qfE%E57~S7n2lCyUc+v(BNI>7% z>bOxjs*9GCOlsQ=z0&_;GI4!y;X+B%5`* zs-ydg{w^jWW+M6JXI$kZLVV%NEzEpqOR5!pU`i3xqXF<}Wa#nrD33;gG{J#aL_Qlj zl&lcBjePKsTIL)Es)&7G~OqAgyjctiF6y{FamwF51_0T=}oCQ9y8usUO=NbM1Fu=2D~Bgj_{h9>qrN& z@=+fo6LN;-x^uL{mQX-8Oxhs8nQ|nxWb~Od%$nR9E+e10-CrkVngg;45M<-fLyS4L z7zj!kWun8Q|6DQzbX^p}h-hL>$Noe{SV3D38R2bhGC~~8;ra2>f)r__k}M{e>_9dB@H2_+s)oDD0E)sMqOU!O+m zL3#zNABj|8p5xyr4gf72X0ERLTzWopu(vSqC@YQFkPCD}BX966B1B-c`;WxUrn^I0 zH#!jzUtY!DqDoi|=@^^qc~iWu9Vd#30{c-o%wIXVg2com0nHLHbBf3ZnyqBPQ~z2J z=ZjmSm>)fTnrK9I1GYA7vashlQ^74q@iTAFwtzC64%W}le%L;5E=7`}h9jQw--yRS zWLR_7|NL3_=Ch@Qi%DXGAKg%WF5S_1LU(T!w>FNA_NJ4mu09=^V*0-H)TxRzLGGN( z+ig@ggq(8eM*!&BDX|pd!*AEujQxfq2MCe1C8-#2%GXHu&*tiav3NMP7VWRJUHtA&uZE3~ZO<_!L~<%w@<~=k=}8 zBLMgZfwIrT<)Q0_SS8VJq3z<;h|{CDged?{m1YpA&Vd+}_I%P7U5~O2L%48wGzm>W zU-BSkB%St2iKbv*Q?8=#_?47(O0o=Bm;xx#4okbT8E9s%C|lXWfAj}!sS};qaC8nE zfbI_hb({zKGZ)YUlR)b_fw~KTx@Lja`+>F$1GPGU9y00gGPX!}eUPb1-| zp-xWz{PGzUWi)R-*{9-FNNMgEP%333is`C?@UAGIe~>?6Q;_vs96jMzkbiK(d;bHS CsuSq| delta 2440 zcmZ8i4^Wfm8Gqg{0TY9ke~G40g9Ic9Yu{QpnXr){V5(pdQ8~-mr~xyV?SMk1Etafc z8=F5MZ}?N|DjwXV)f4W%PT39)uJmr~=I)ZAmhIRM9saqU-spuo+IeNqn@@q;m;1fX z`#%4l?|HsAGamU9w|vXzmq!NLoM%0gi$CBm50~$n{{$ma$ojx<}2bJ^7A#!LRN{xYu`Q6)UAlzSb`>FKz&1Z6GFxbKsy@lLbc?Hc68q* z%X*-PZtoLqKs$V-Ok#&}cKz;yIwZ`+$ZgNmzYdqR|tF_trdTQr`K-q|DTN zNDaA7*wva}hZO4{igze6B))^p-@WgF1<&jDRenY>{@UCnnu zD`J7xRRFbMkP~(`(XgmQ?t0XH&&~XA@7>sD+3h^;k_Y6s_g4dt~`k?z;>AL$h$O<8X5g=^W5%j4JKL zN}2!Q;b0B@`rtiyDcY!-g+RFp*E?hebg8#NC%*$WomywmrRW4*%%1j*>sy7}aN#^C zkM!0OZM1H4Ww7+S`t-mKYp|9~@2t}6QbWOCJ=VLgtE#!I)1-O?fkG4394ORYG^w;7 z_zUj8x9|I^ptaekddr-kI8CNaf6x0%9^23u*L3_I__OcBt?aUSqiWx`#;8`IZ2p3` z^szsyYW&zF=jr5DnLiVCwp7L#RXTO)W23rNu1oR1hzYB8a(~Kw{Yw9?qyDsCV63wL zpk3FR~swV4Xg2F|5cG@P3q8=@};1LPv?9I0E zoM~N@q-0WA#}gDi8GF7F3^BhaiQqHE!6~4tv11B3VghKQ0qDkV?DZMM~No&+jZ)7&CBx-27Qyt9}Di>Bn=D z6tkdbIfw1txiegUJJwLxpNokZL-u*|%<5<+2KKiSHlXeZL1Z;Alp?YaIS5SNgW)}><3S&uIz%JF zjTlBe`~e&ZNHLrjsTX~C%aCV5ir~$0&EoapK8HaD5&i%f0Q^w#Q+3a>sSjESh_(;o z2+3zH&a{`SOM(H}1aUz?Fr`UqahS{V)d5*$v0s*NNZxfTRHRgcewxiV{~;vLv9Z${ zPNq)(a}CDLz)%@8KrI)wM~VT8+mPZ*D8>RcUm&e!vuFMt77sMX z#-`fu35nBejJ=7$GJJ*M+pYu6ju0KbRfIG!XU8a^%-k8&VpC(e!y8}lHd9FrRa;nD z*KvMRj&*G(VR-H4*hIz08%T82mq1e*uy%^T-Wdj2*4ck8vopAev&D>0&Jqn*H{?7u zS(34m^XtU_p34$mK+%%NB{5Kjo|#!JIq!YuLW(9u4n>{s8CPS*tb%K<%tyR_p^yks zU$WTVaV1U*zko5znch-i%P`C6(-R*n@6+Mh(5Kh>UQ6`Lo1VN>Yg8QzHpySx6uQXi zD?V|!Z<~yFV&S45zm@p@qx_$Q*;z~fBx}LO;3R|^E0rI83Wd+Dge7K<+L7sA;PP_seozalK{ z2M0eD1lGq d14un~K1o@RY3PvU|YBwT2o#<+cK{*|GV}jmgU+< z;oQRPWOLVANj!55T@~1nnDx6iroB>{9~rf#wP^_+rst`?E&g_ zOK06ehypm>8qF|JT_mDKlCg6V-KN0Nvf$q4)~u@r`r~wjPm+0`>c-oE##f+kwVtwc zNtVR#E&eFb4qsq07M6U2Gg#DUEK3*-L&(MC(eDeIB7j$~d^~M&U zM=;!nH-I{PK&x_q)?0y=%YmMr272l`(1yCp&!JE1Z3}_>=MPQAQZ`RZhZQU5(HEbU p{Zz1-8>G8|QmJOnrl~WWg!rM2wC|b-Bin?SsV;dq`I|5>@;^M->*4?a diff --git a/src/draw.c b/src/draw.c index 545ada4..5d90b7c 100644 --- a/src/draw.c +++ b/src/draw.c @@ -127,3 +127,9 @@ void draw_upgrade_message(char item) } } } + +void draw_timer(unsigned int step) +{ + if (!(step%60)) + dprint(2, 2, C_WHITE, C_BLACK, "%u", step/60); +} diff --git a/src/main.c b/src/main.c index 095af29..7463d2c 100644 --- a/src/main.c +++ b/src/main.c @@ -52,7 +52,7 @@ int main(void) int start_y = 9*16 + 4; int old_x, old_y; char spawn_buffer = 0; - unsigned int step = 1; + unsigned int step = 0; set_level(level_id, level); draw_level(level, upgrades); draw_level_anims(level, upgrades, step); @@ -70,6 +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); dupdate(); old_y = player_y; old_x = player_x;