From 0b8b3486c1961393a4b5166b0af3dceef1a08ef1 Mon Sep 17 00:00:00 2001 From: leriche Date: Wed, 13 Dec 2023 17:00:25 +0100 Subject: [PATCH] score fini --- snake/Makefile | 14 +++++++++--- snake/ajout_score.c | 51 -------------------------------------------- snake/lancement | Bin 20376 -> 20656 bytes snake/main.c | 13 +++++++++++ snake/score_init.c | 15 +++++++------ snake/score_init.h | 2 +- 6 files changed, 34 insertions(+), 61 deletions(-) diff --git a/snake/Makefile b/snake/Makefile index 8b4dd61..b92e83a 100755 --- a/snake/Makefile +++ b/snake/Makefile @@ -7,9 +7,12 @@ but : run ### VARIABLES ### OFILES = plateau_init.o \ - fenetre.o \ - deplacement.o \ - main.o + fenetre.o \ + deplacement.o \ + ajout_score.o \ + score_init.o \ + main.o + CC = gcc @@ -23,9 +26,14 @@ fenetre.o : fenetre.h plateau_init.h deplacement.o : deplacement.h +ajout_score.o : ajout_score.h + +score_init.o : score_init.h + main.o : main.c fenetre.h deplacement.h + ### COMMANDES ### diff --git a/snake/ajout_score.c b/snake/ajout_score.c index 654033d..b78bfaf 100644 --- a/snake/ajout_score.c +++ b/snake/ajout_score.c @@ -7,34 +7,6 @@ #include "ajout_score.h" -/*int main(unsigned int compteur) { - compteur = compteur + 5; - char* a= (int) compteur; - EcrireTexte(1250, 600, a, 2); -}*/ - - - - -/* -int main() { - int compteur = 10; - - compteur = compteur + 5; - - - char a[20]; - sprintf(a, "%d", compteur); - - - EcrireTexte(1250, 600, a, 2); - - return 0; -} -*/ - - - void ajout_score(int* compteur) { @@ -53,30 +25,7 @@ void ajout_score(int* compteur) { } -/* -int main() { - int compteur = 0; - char key; - - printf("Appuyez sur ESPACE pour ajouter 5 (Appuyez sur 'q' pour quitter)\n"); - - while (1) { - key = getchar(); - if (key == ' ') { - compteur += 5; - printf("Compteur : %d\n", compteur); - } else if (key == 'q' || key == 'Q') { - printf("Sortie du programme.\n"); - break; - } - } - - return 0; -} -*/ - - diff --git a/snake/lancement b/snake/lancement index 54aaf3752d4ba0ad359c4337f47679bbff89e724..74a99f81c607abd07e23bb79f32da7908139ff23 100755 GIT binary patch delta 3054 zcmbO+pK-%N#t9Na4uT9|-~c8W7z{ioYAxfk;DT^1xF+7x-oyBQvLlQ5;lP|DHF!D`ibQWinojlQ5d=jg~q)mRz zW?XN=;O^t;KKM6TPEa-=iJyVtzi71`1H+dz zJ%0HXuz4Q6wu<%)3?99#QXtCmM~SFMH>;f;1A|BFffCOD5BTL9Knf2-X^&ppk08lj z(^r$b1!WjnC$A8c(^_lCz`#&y9O}_*`^c7ofx)BmX$h}Kw{4#t$jS@03=A)l|NsAg zjJ0L*2f;?!(|`Z}_vmyzu^$u>FZM!s8z8*(oBM=fm?XYQflP7T;nBm>C!t_6agDFzg2rFY+eO z7nP6-#Ug!#g@NIP&E$)s5+=%6q;GJ783_C!P_#$<(hU8uL_HY0Hd)Nj~ z)|1Sh+#r|Cb&P=#BE53*6RC@g*EesI&ShlM{5-i#)|q$7C$Qf>fXuxyxm4DLF?jPX z*%OTQ1|FTYH&Q&hSyVN^G4A@q@PJ3R>y2)P-T+n*qf-Dxb_;m)x<2se<&6~p#ppSY z&f^fvc76E&eDdWN9iY$zOMyev?8E>66Fje{_PC>`!9g3 z^yuZ?#gFPt5s;2v*9YjXsb^q#vGP4QY;JgThyFdU?hibU zyS@N9#pAf^2M~SC^*-Z%P?C9305Yi4^@B&Z>xW|uOppMQ2HDK&;Ka}1(dqgFBBuWS z|NosHpkyAkij{$3AE=z)4l4^jW}-~ay}Gdwz7UqJW~@BjaQ zE$q=93bN{fN9Q$=^0@E+|AX8DQL^;?WK)|NobOiq9wi|DR!CVCaAG|Nk2X28Q_e|NrwaGBA97|NlQI zKeT@M|KEpka-M+_mUG`K7HqQ;XtcF1t7;4z|fz zc5;lVlRNF~8D~sBX(unZ02C|?3=E*c8>H{S8; z3}#Roqzr^7Om1{gl5%%;wo=e=_Y2ijFf`UP)H75tGB7eWFgG-rypc(I@&ShgMzhHW z9mE-(LF8lwM+r$UkZuM+23SQ6<}xra#7+)$6gMnpU|?Wm5M{Ukt(Rc3!Hf(H3Jekq z9iV&%6J%gur~y^JhT)713_=Wi46rtZ8dOCDRQ!VoMBp~4KxANG=$$OcB0gEeNkVcX zsM=!UXJ}D`sDP2%LFO_Z29wvoCZGoRNV+5LEp_8yzfAZEBMzI*T)!Prm3R zE*S`}d@)@d2X0qXf>e6;LfvPm05Jd@{R|8YGeG7uNifVn^X(F-IIMPt=we{l2r^A_ z2iQhQ3|&V+vW)k^^nWd;U@2Otv-^}wcKy4Vz|%M#k&*bXWh85kIxCO5i>Gsc6-5-`~WA|)q7)gOe0 z$RUVj43j2rbg>st%*rng1oE`ht1TtOKL< zCR=*x3od|)!f1!dm0tRs51^tCCU5jIhv&To&^$O}@=vdN4h3k|ovi3BK6$#gAflNJ z&411UlXrRRalz7Si{j)@-foPRlP!Jp1z}kVM*B>z^wAgUfF@EHt-!c>myaDI!4DNdoruPHfMt? ZB#vfGw)8jWk^q&q3=9lnjFYQ8bA-m>`Xrgh zhbGTq-otorvLlQ5NIWU{IR8kx6*61giw&cd&c{s{|v@WJXqT z#vfq*4i<^Y2UralZ%+Qm`g-zPHjBx+>_*H+dZv?e*(Jjn8JHMAn2CXzff39CxdkMm z$jHC|^%}#LiPP8^7?>Hfp<<;{nVbv^ObljF&mQmv>0)5ufKUtqlRvVHOCErRUPAyx z7$(~=S&^fdQE>BA4s%9Ep~+`C#TkVsKjl>3JV!BsZIgfk<75Xx=>Qu(28RElv+Wod zzNG2#%eR2d@aVNQv}a)O=w;OcQI<)?45h}Q9?iB)Af`v>(-K~fZrgcwAS*xEGBCVI{{R2~ zG1e)Q1%w)9U;q98-=ov@#C}j@zPJnFZGiC3Z(b)9!z3Xl&A{N%>AJ(CmsJ|VJmAsG zDla`*NmQ57c5;BI1mly*nWD-}48JG$iHb`t|Mma>PBmr*hF#1I3=I1~0kt1Qyy%;} zUsOV>6pQo`76yhFF_S-vN|-ofk-iC%)&fa@Ox$%CWUL7@1H*o>gy65qwql?Z5h|u^ zF7oUDe~)h09Xmm>=h1m+pAI7f!~RDg18)8VOC5kqMZ%@_O*vSUs zMl7#>{Qp0>UqXEHe{sRded5YYw|`7F6gOnaK!}?#MS{f`pG{7ea299!@&A9b>k`K1 z+9m3B*FCyjH+Xa&fAMDWL5X6KjPL*dH~(PdZw+T-VAuhQ#22NLJtXh4PyhD+zlUw` zWIxI5$qVF?xsEX~LZo+2W|6+g_0Cx8&(D*m$vX2M`2_aB2avfxCQp@hVJzN! zOZEg~y~2x$AgNB*7aqr5KY)xs=K7p*KO+MJ!;5_%z!ChxqucevF$N}x>7F0||My^Z zaN-9=><@@o>4*RScY1)LZ51m6!#*ws28R70;>8`13Ei$QK-NC^^8f#9VUO-mka;gW zIN`e4n146u?D%w=F;aAII!U}O+yc;OEdfzT0? z4?2oVS}-y&C@@GcR6q+Lh#Uh$;$%k_aYGwM1_mJpJ_cAJ4-P*D1_oQG_yrM&`rDuk z#lXN&G+B^Ee6j6VP^0vB|)|@NlxBi$0_9vL8>MJpzs^frelQ&@7%m@Md1&&V)&qK`hj830QuzxgI# z^3mghML#I*`?@h2PY(3e7lfry7;Q6oqOZPS0W`*8^n=M4J>@rl@Ks=BoG@9?U!N0} zL@OqH`kQmYqP1gkr@uXC2ekPiJ^7-)x#$WgPXU^GWEdD2I48>nXmg%$fdq;9 suivant) { @@ -77,6 +88,8 @@ int main(void) { free(pointeur); + free(compteur); + diff --git a/snake/score_init.c b/snake/score_init.c index 35bee3e..b29ac2b 100644 --- a/snake/score_init.c +++ b/snake/score_init.c @@ -6,15 +6,18 @@ -void score_init(int* compteur) { +short int* score_init(void) { - int *compteur = NULL; - compteur = malloc(sizeof(int)); + short int* compteur = NULL; + compteur = malloc(sizeof(short int)); *compteur = 0; + char a[20]; + sprintf(a, "%d", *compteur); + EcrireTexte(1250, 600, a, 2); + + return compteur; +} - - free(compteur); -} \ No newline at end of file diff --git a/snake/score_init.h b/snake/score_init.h index 460d4bf..e6396c8 100644 --- a/snake/score_init.h +++ b/snake/score_init.h @@ -2,7 +2,7 @@ #define SCORE_INIT_H -void score_init (int* compteur); +short int* score_init (void); #endif /* SCORE_INIT_H */