From 90fdcd70365b205db224cca2e503ea52ef03a7e3 Mon Sep 17 00:00:00 2001
From: boutarci <jude-christ.aissi@etu.u-pec.fr>
Date: Mon, 11 Dec 2023 17:22:35 +0100
Subject: [PATCH] ajout png + beug collisions

---
 SAE_semestre1/img/bombe.png | Bin 0 -> 4883 bytes
 SAE_semestre1/img/mur.png   | Bin 0 -> 1289 bytes
 SAE_semestre1/src/game.c    |  46 ++++++++++++++++++++----------------
 3 files changed, 26 insertions(+), 20 deletions(-)
 create mode 100644 SAE_semestre1/img/bombe.png
 create mode 100644 SAE_semestre1/img/mur.png

diff --git a/SAE_semestre1/img/bombe.png b/SAE_semestre1/img/bombe.png
new file mode 100644
index 0000000000000000000000000000000000000000..a42b71b766a1138859d3a21b1dae92bfeaae50ef
GIT binary patch
literal 4883
zcmeHKc~leE8lSKm5k*v7Kto(g!AUaN2r*#`2vLHpg4S)4nS>FtkW3)*w15SqMe9*O
zti}fxMe9yQICZCpyI85qvj>X4+KQqr>Z@&~ue>{9Kd<M!<2kSYkvTW>&3AwIcfb3)
z-~E#LFg7M~41Fpcf}k<-sPK4jpFlMiC-A-LL+>%*_7$EYSIgyokPCPKNSXsgqcEV+
zhS+vAd&nO63PBqWYzjlQsWeC1eIu}^_1UGs_U*&i0UM#&LDW=M(73>+xDS9vZ0Mcq
zEU>AMi|vX67RB6ukCZE78C({^Ve$B2Jcr8@BU~|pFc6_wz!xJzfTmRrMno~SW?(-6
zmV81ci<Qe{41-axCem>TvRKz`kw!I!cr~p|h`6=Dd0vso;ZRIwocpDv1<XX36JZD4
z=9Ir5T2eTxsVU9?i+-(1F&i@O-f2i0=MWsSY`Jy9@;w)NW*1CCrhEPJUE7&UZSz7>
z6Su3)O*BRQ4U+4lHXT&n^bhNZoQ!O|dY${jtalyTUzj&TD}Pc-uJyE5s6uYM=ju{)
zAw#`g_`>PM^=hr*+jl-bw)N2X3XetG$<TjB9`T=kE`xP)ZrAmqPvkc}B8!@o&i>xl
z7gW!eD7=ycyIvL?y5#p5ZeF_g;?iFpv0cCaxePz@wO8o);*|9c?)25ZRdzey_{rXB
z3fuA8Bj^wG9(&6|pX4bUy+-d3`{3D|hMosm^^4KfEeq+hbAR-_^xI_n?94oMTgKVV
z-uu?rIaK8NpLu>%n0tRwOQ#mjcF3>KEAFhTenu;wcmAsqpPirkI}-E)yRP@=x0l*G
z>GRGCj@I7|ikXq?YA!oTb92jk!NiYtpFUN8yguh<?VD~|!yDs8QFZiskb@Q?F@;P~
zM2l5=Eepl;N}OfU8mJ9}B*7K~s!GF2h7#8hIw|v~Q|Fir0+TY61qzPBAj4CMsB9yi
zkR6k#%1%=SV$9$my2K&|1X`R#85V82&Lp--nKoWAuqij2$*@7lG$}I$<dIBo#2I`R
zpT&VAEJP-k8ANADjF?&+A3nd20z65XsU&F-v)Nf$S*$D`OK;S$k-)$}HiygRa$$gg
zO>1-{YJqj8nG{7YM>uX$83_YP=yeQ=6IJTXq?E}7{fz$jv<8J@fL>?nQvv9~wx9+!
z!s4*CTK3QpCNd%ukn{!grz1>>YYaF$9yjUDMim~BiR;LjLn$!Tz<7h%m~LARrefpi
zxE4T7U{++<l+=kE7(q#(A+!eDC?NJQBuS_T#TphH)ni-E&_KZO0p4Ng{<Yh{0Hsif
z!}TgN6`nj?%B1EOV|o>ViESoFDH31^R|xaC0zS+S<e{)Akk5xzqCf;!t57bEphKwS
zIunWNR5(Qi$XNv7K}9^CP=#}00go2|^8*kSEaIs!I6xp!qFA6>z!xcpP%JVMAS==I
zp;1v(7@$H>o<JnRahS^!3PCg+92SZAB3LOvMFApQq!#kjHY!Xdp077*QLvqa7S-Tv
zgHB`Xpad6(#>%BkE{ikhiA_gIH5edeMiV--Ww0ZW(BcUsN~wtifP#o{ID!B!M+mGz
z&|=(Z0+~p0+G?k*huRh~SPT#rrScRI*!*BEVwn*~Nxd;quTPgU2deHsw*nj|3?<QU
zl*9q)Kpjr(ufzTvM9k?8pQ2OfF+#oOf1#<v!;k<x*zzdC1m<63bM>C61U#ensrNCR
zupK1^!*(ddsH%4fCNvYrY;gjv-Y!)ts?*@0di14hzn}QCRKU1u49788g((FvpTiZv
zA{66+d<ek#n3~TOV8Y?-CcT=>LXCK+2IvU10_kb{g<|;HHtOBs=&V$n+65pOjBsHD
z=@%@ZPcU}hg4tBf=wGpf{a>0$Y=9v}28`?Vf#L;fA$y=0_Gw0yoxkwYw-<lm41juM
zlDE=#M6MCJ-b#VD0*_?Zh+J=_z*~Vwvg`jQ7k%(`3fF;uL0RBssnELo1bESMQZ9@P
zhkB^1^31*x;2C9zT4I8r(H>NzK|8FIfzz3kD<Yg9yN(_!beEQTGa$(Bm^?f*QFQH0
z$--2RxCw<l-BA}MJ2W1fX8Z0^#?L%i<ZJfvn^3@ngC;HT{K&DP>{FIQ#JGH&!(Lq}
z8Fy^j#EDfC_pB#Bb6-|_mtNPhA!_TkIde+nT;9Ec#j9^r=_Cfvp6|QbdaQqQYw(ku
z`l2rBy;}dLd{)iebFEzl=B}Wc8;#e#nRM^LKQ6~lKkOW@cl;7!IBXDxHY^iG3!lo0
z+qSGbooES*_^spR+W67izNk5}Ws1{B`sh`ynVZMOG0?-;9y$LjBBbX6gTCE8!rdJF
z#(LnXL0!2sW~`T{`Bi(%>*6c5wf7$S8z=Ex%I;^<NPg}N2B+ZaIP2Q+i(hTIU1LZ~
zs!aAi(OnvMb8B72lo<g>HJPDA&Ml9NmpdkQES;I(4DH(EQ1Wd?^DF4QKke|oc1?Nb
z?`?I<?<ap|a@=>;>{CA@v|E(Q-Sl#O$gM{mg0!pmW|<y!zV6DZ8bvsCNhZ7g*zxq)
z`4hWTjK(VmeWyix-rha&Z2ODgzjvqH@qsuCWQF52Iak_P<!Q%nK5qQ_*W%k(*xx*G
zN^V?OaGz)0I!e9Gfs@?kzPEO4h+8hi`2GEJMd3{5)J^my+g93#{E_K<`T(uEbj3<L
zI9Q=je7bjUM0i!)t=87H?aG=%wA}Re>bnO_sWmBc3&K#h+*2*8ybx%`QO}LY_2%a3
z){2Up*X6r|>%x*2C4E54y|cPtmi&RW@d>$Nf67C8+meIc>f=+MKY!lw<OxkRw{~jf
zin05Nsmhv^pMz6&e|I7`At9mYQckstPwB}J`PRZTT5%Io^qAvn|4DRpJu5cp&Zq@M
zj-ayfVJ<p3cEap9zq09xtq00Ht)}uLowBeZA=G7&7*4evyPv*lqfhy@b=$4h)~e2I
wde8XMmKaD+n}scjx%|16k?-|o&&M-3`Tw5lR#3bgq%$OshzUOuwrc%<0D9xjO#lD@

literal 0
HcmV?d00001

diff --git a/SAE_semestre1/img/mur.png b/SAE_semestre1/img/mur.png
new file mode 100644
index 0000000000000000000000000000000000000000..2c4a479f9d7d143196b7ee9d82a46cb9e7b79e3c
GIT binary patch
literal 1289
zcmV+k1@`)hP)<h;3K|Lk000e1NJLTq000yK000yS1^@s6jfou%0004mX+uL$Nkc;*
zaB^>EX>4Tx04R}tkv&MmKpe$iTcx5c4t9_tlA$`;MMWHI6^c+H)C#RSm|Xe=O&XFE
z7e~Rh;NZt%)xpJCR|i)?5c~jfb#YR3krMxx6k5c1aNLh~_a1le0DrT}RI?`msG4PD
zQb{3~UloF{2w?zWj3O#AQ=b#XG(5-GJ$!t<i}Nh+bAOJoQZO0d6NnQ`H!R`};+aiL
z=e$oGVP#1nJ|~_q=z_$LT$f#b<6Lss&od)NHZxBgAr?wqEO#+08!GWMaZFJ)%J=77
zRyc2QR;zW^z9)ZSsGzMZbDic0Qdq<iL<o>kM+H?_h|{W(Vj@HPNe_S2@r&e=$yEU(
z#{z0lAvu2VKlt6PS)7`5lR`<L_r<n9#(>~1&}!KB_pxoaPJqBOaHVzpwI(q8NqVEB
z#g2f%ZQ$a%qse=~<qk0Xq)Ue6NCBGuVi9;hqi@OsL$^Txn%i4@AEysMmbyyc00)P_
zc!{#tJ>K2d-P^xs+Wq|ifg*COY|6Hl00006VoOIv0RI600RN!9r;`8x010qNS#tmY
z4`BcR4`BhQKc{H`000McNliru=L`!CFb3<H>kj|`0|rS%K~y-)MU=gcBsCO;zjJL@
zRd)|FpcNum5wJPp(RczLfP^Poi42VvqLqMv0Cwr=?y9nV2;5?w*|M+i`Mdh<=ePd-
z`4@x$*bN4zv85RVG@u(wK-|x-9V+mcAV=`^x8ITfeD{vGKYou5t(#jDUE&Z1AjkM%
ztzvDkBr|6q%&m)$Yw&96l+#ztKm0`Q5*uRgaM@t*A|z@uLQHuStP=aZxG}v3wow+l
z#l?kc$iBn8S}+Aq$p{cZ@30DTf(2Lvl4uqF?ZGjd$835ZH2|^zHq&-9FTvFMfN$Xr
zr9kc?HPbv^g(2INZqjD3$kX69ccA6b)7C_FuoP%9epQ7PQ4$~s0U^AJO9doKh91xv
zXn2_6VKSErw<ZpyqW~AcaNY)Qr)*LPg*k?KSw%~5ET+sR3vx4DE&|L;h0Sp2ck(^#
zao%BXVlP8=0g>Rmi7rSxOtWYn_Mt4$yEtYjo7p8S6V-IXlEEROh<P653pf=+9}aFA
zbQh3A^s!5(YH&tCk;ieshYE9oQ#J<Z;*^FUdpElv0eLh0a}%`-ERb0d-Jo4eMdSn@
zccB~Hsz}MS4nl0ZXh53=T{!_$8V#-u9v5?HrZ-qagy4|PoZwtV&ah0-+Q?%U921{J
z31A5$Lq|*l4JkwP!Pg={W|Qa*QZt1CsAsXrl(<7~z<C$fDmII@#wdunwqRY&(=-hJ
z_YJa4Ya+VYn)p!R%ZDH~SPeO8T#gBj9^4!zlQ55T&UwH*PG&CVdIgstH<O}sT*P4p
zO=BWu43kIX_b%w7w0kgZW{s#tg~^~I&efC*B?}4Y;5NovUJZZUf@K;}`|tv#!c@e|
z2G=HDeF0BN7<2C8(!>rt%q9eD9mGqJi{P^v4s)li@c1yAyEapn;B_`RhCsH-$sD?f
zNi5l@4nayb2SIiu+UMVpCX?C-cr}y;w#a$Fz7KT5L!70EE)QCgNT)|40{!~@>_6VW
zC+q(=bcTgss2zM-4X7Ue6viGiFciFg^M?NbFjJnA!_&@-00000NkvXXu0mjfxD+;u

literal 0
HcmV?d00001

diff --git a/SAE_semestre1/src/game.c b/SAE_semestre1/src/game.c
index 2703a5d..149e715 100644
--- a/SAE_semestre1/src/game.c
+++ b/SAE_semestre1/src/game.c
@@ -48,7 +48,6 @@ void DessinerScene(){
     ChoisirCouleurDessin(CouleurParComposante(91,222,122));
     RemplirRectangle(20,20,1160,700);
     ChoisirCouleurDessin(CouleurParComposante(255,255,255)); 
-    EcrireTexte(10,760,timer,2);
     serpent=ChargerSprite("../img/serpent.png");
     fond = ChargerSprite("../img/fond.png");
     mur = ChargerSprite("../img/mur.png");
@@ -67,7 +66,7 @@ void DessinerScene(){
         pommey[p] = ((rand() % (35)+1)*20);
         AfficherSprite(pomme, pommex[p],pommey[p]);
     }
-    for(i=0; i<20; i++){
+    for(i=0; i<30; i++){
         murx[i] = ((rand() % (55)+1)*20);
         mury[i] = ((rand() % (35)+1)*20);
          AfficherSprite(mur, murx[i], mury[i]);
@@ -85,7 +84,7 @@ void Score(){
 void Update_Timer(){
     snprintf(timer,6,"%02d:%02d", minute, seconde);
     ChoisirCouleurDessin(CouleurParComposante(0,0,0));
-    RemplirRectangle(10,700,1160,800);
+    RemplirRectangle(10,700,12000,800);
     ChoisirCouleurDessin(CouleurParComposante(255,255,255));
     EcrireTexte(50,760,"time: ",2);
     EcrireTexte(120,760,timer,2);
@@ -108,16 +107,33 @@ void Update_Serpent(){
 
 }
 
-void Terrain(){
-    if (pos_x[0] >1140 || pos_x[0]<=20)
+void Collision_Serpent(){
+    int bombe;
+    bombe = ChargerSprite("../img/bombe.png");
+    /*Serpent contre coté*/
+    if (pos_x[0] >1160 || pos_x[0]<=20){
+        ChoisirCouleurDessin(CouleurParNom("red"));
+            RemplirRectangle(pos_x[0],pos_x[0], 20,20);
+            go_on=0;
+    }
+    /*Serpent contre coté*/
+    if (pos_y[0]<40 || pos_y[0] >=700){
+        ChoisirCouleurDessin(CouleurParNom("red"));
+            RemplirRectangle(pos_y[0],pos_y[0], 20,20);
         go_on=0;
-    if (pos_y[0]<40 || pos_y[0] >=680)
-        go_on=0;
-    
+    }
+    /*Serpent contre Serpent*/
     for (i = 1; i < segment; i++) {
         if (pos_x[0] == pos_x[i] && pos_y[0] == pos_y[i])
             go_on = 0;
     }
+    /*Serpent contre mur*/
+    for(i=0; i<30;i++){
+        if(pos_x[0] == murx[i] && pos_y[0] == mury[i]){
+            AfficherSprite(bombe, murx[i], mury[i]);
+            go_on=0;
+        }
+    }
 }
 
 
@@ -200,7 +216,7 @@ void Serpent() {
     }
 
 Update_Serpent();
-Terrain();
+Collision_Serpent();
 usleep(100000);
 
 }
@@ -211,16 +227,7 @@ void Pomme(){
         AfficherSprite(pomme, pommex[pp], pommey[pp]);
     }
 }
-void Mur(){
-    for(i=0; i<20;i++){
-        if(pos_x[0] == murx[i] && pos_y[0] == mury[i]){
-            ChoisirCouleurDessin(CouleurParNom("red"));
-            RemplirRectangle(murx[i],mury[i], 20,20);
-            go_on=0;
-            sleep(1);
-        }
-    }
-}
+
 
 
 int main(){
@@ -238,7 +245,6 @@ int main(){
         Controle();
         Serpent();
         Pomme();
-        Mur();
     }
     FermerGraphique();
     return EXIT_SUCCESS;