From c3c14e39c9aac0f0ede615ad0ba6507d22c0d4c2 Mon Sep 17 00:00:00 2001 From: akagundu <david.akagunduz@gmail.com> Date: Sun, 17 Dec 2023 19:35:53 +0100 Subject: [PATCH] correction segmentation collission --- evenement.c | 7 ++++--- evenement.h | 2 +- evenement.o | Bin 5232 -> 5136 bytes main.c | 8 +++++++- main.o | Bin 5840 -> 5984 bytes prog | Bin 21384 -> 21432 bytes 6 files changed, 12 insertions(+), 5 deletions(-) diff --git a/evenement.c b/evenement.c index 8549670..8e9e04a 100644 --- a/evenement.c +++ b/evenement.c @@ -40,20 +40,21 @@ void InitialiserPastilles(PIXELS *pastilles, PIXELS *serpent, int longueur_serpe } } -void MourrirSerpent(PIXELS *serpent, int longueur_serpent) +int MourrirSerpent(PIXELS *serpent, int longueur_serpent) { int i = 0; for(i=1;i<longueur_serpent;i++) { if(serpent[0].x == serpent[i].x && serpent[0].y == serpent[i].y ) { - FermerGraphique(); + return 1; } } if (serpent[0].x<=0 || serpent[0].x>W_GAME || serpent[0].y<=0 || serpent[0].y>H_GAME) { - FermerGraphique(); + return 1; } + return 0; } int MangerPastille(PIXELS *serpent, PIXELS* pastilles,unsigned long *score,int longueur_serpent) diff --git a/evenement.h b/evenement.h index 4c53aee..f127f37 100644 --- a/evenement.h +++ b/evenement.h @@ -13,7 +13,7 @@ void AfficherTimerEtScore(long unsigned int *score,int minutes,int secondes); int PastilleSurSerpent(PIXELS pastille, PIXELS *serpent, int longueur_serpent); -void MourrirSerpent(PIXELS *serpent, int longueur_serpent); +int MourrirSerpent(PIXELS *serpent, int longueur_serpent); #endif \ No newline at end of file diff --git a/evenement.o b/evenement.o index ac9d453d9b0e9804d582e9812b9120dde51614cf..8c88df1c44bde9bb5fe1c096a4440217773e48c1 100644 GIT binary patch delta 671 zcmZ{hze_?<6vywqPt&KU@2P2mphAOA4S^1l5@96aV0-o_gkV!OL=c$-)@dkcaI0v^ zY;fwwltYVKQz<zlF1j=cb?$plxJ&18Irn@&=X>sZ_YI>}d}y^E+h)G<?ss{s_nH|K z3``W$AP0{uL}T#5B3?^VlUDYTRWjpbrnhqoK55Qr0CST&*Bfh6$pkISq3fR48K-i< zmK;;;rm<m_*@7mb-o@o6lsF{bMM$0x#~9+`dcmZX<eceQLax9_@j~0yX}s9|EHH0a zc?aJH^-hw6h|?cfH7K8B#Wnub;|=migU0xYH*9!kVGrrCL3x@Iyk}5HdMQwcKp&v% z^k;KseH3pJ&#eghwBWiDbg{n=i!Og)Bv4gwrJ#s(nZFzcKTD)18ol_3esM|%(06SH zCf9$h%^`%}2VVs!DxdTR@@m4?vg`0&f>Sll;uic3KIo{?$u{hc(l}(@X$nwwr`eOy tf$}rRo;2-1){|y67aVy~a*cl_h5~I*LcX)<l^0ZRLY`6dsswE{^aqKgvBCfV delta 757 zcmbQB@j+vP2IGf~n$=7S&2JPuI%{8amOeS|`iB7sfD|K;dL7`=?fRlyVDdvIQC0@a zL!~;CZ!sx~bL{}Bc>yAtfeO1_|5&>|saY|ZpIM(5Np8Z)%|6T}ER*-KckzRDxbg|K zF*)<HF|FSm&cVsV2^Itz@^G>tr?}}yAWMjWkwKUlWH19mAjkzE0Hi_UDJ&4~3?>LI z3=|ibypTg=@<y%){BEg5xv53&MTrF&nT4gPn<sEfFnJz>Dh25j2I4>eA%F*J1-iH; zR2-xY#FPPI5OAD)kXKwX5J?vYP!wj`rO6+GvPw|r!SpJCGy;LvWJNx4$;nVz5XA<> zFuk)T2LfdmA<6P0$?lrm$S3X@%nB3&0+1qPdnY1^ivi_eX0AmNM^^uS@<X6q-;rbm zk#xCC7UUO~^Z_{z2talr%T5Q&&c`A95+uv`adIbrz9cOAR)Ec6U;u>&2&YUI6u8g$ zXYxk@bFLrU5J?V}$wq=^Og8MmXcU{=AgBRj9uU-Ew3+-;(4KMTWKAJ^rlU|5LK=)G yCa)B-XM8dFB~Ta`|60O!oGU=S1Oko8g~H~X7q}oimB|}{yb1vbuViwepgaKgWX{F_ diff --git a/main.c b/main.c index 8a55384..72d98a2 100644 --- a/main.c +++ b/main.c @@ -207,7 +207,13 @@ int main() suivant=Microsecondes()+delta; AfficherTimerEtScore(&score,minutes,secondes); direction_davant = direction; /* Check si le serpent à le droit de changer de direction */ - MourrirSerpent(serpent,longueur_serpent); + if(MourrirSerpent(serpent,longueur_serpent)) + { + FermerGraphique(); + free(serpent); + free(pastilles); + return EXIT_FAILURE; + } DeplacementSerpent(direction,serpent,longueur_serpent); if(MangerPastille(serpent,pastilles,&score,longueur_serpent) == 1) { diff --git a/main.o b/main.o index 3298ec2b317ab23e0261a227d0e986bb2994301d..24a82761a0ca18617895fa1882f65804d8103900 100644 GIT binary patch delta 605 zcmcbh`#^7k2IGT`nwMA@uTTENV$8UBvH`0<qt)aFRs#o4CI$u%+u;8U4E!w}3~+Y) zM@A4k2q<16525+n?}Egde<+mHde{bnWb9v_n*4#a&fFU)(NMdZk-yau$U5e_n&G7d zkTKz<5t!5glWJg60Z0OsGVr&GF-~5}=FNC=@<%pT-PQvonmd5jGrRy19^I}FJUWlV z*dJi*9YD<tuZt&}u_rL@nLM3c6X^KO``KL?g%>jeWnB3L+L)Yq*_dZB^RRPF4iuK$ zY`|H;$hdg(N-lLq#{9{S+~SNSV6q)dP6LzkK;&ivo_IzPx74EC)FSty#Da{>!qQZR zw4&71$$h-q0`c+1C5g$|@yQw4@o9;fIh*hCa<ND<u!CI7z`z2;GC=(2KLqehW)u=< zlmL;EW=Lw}kkkZBHWU)KEk%-5K$7i65=S<98Iri-=1`$%M#eRhHwv3`YVZMd1Hp;O zABD}C-mn9GFE-ghL<7cb5Yb@#FnOhjJ)`sFmm>B|`JnItsu0y+ESQ`rYR@=f@=752 mVe(5+drl8dh+zhk4aLkkD|jHh^^*&MybNIouVk{Jh&%wNzON<# delta 474 zcmaE$cR_c824lcR%}Xqdt0w<pF=i~AY{2Tz$UC`#)xhBnBLjnnZSa2v2L6@~1~|L@ z2v|G_C|)A(VGE-9+c$v3ntv#i)Oy$kf@JJp&Yk>$wa#1)DA7>6nvuU%1jst(x|-o7 zH;^&mB`cT&Dh0BCg2~T75~!4czx5@<<fUxhjB_S`WOJRI%$~sba`F*&&CMU!T^NPS zn1RY%`2^aSoO#)pbD4SAIVL|8mfW1cS;5Fyw)rNPIwNDz<U($7#zrvN2_|Q5PUI<L zocxAYOVus4C^xmpy(qCDBeSqHl_5U9xFj(-J3cuhJ3cKjGY4oq1H)!DJ}wqU&dG*C z;*83Z6NSVjJ=nn#3@kuO4v7E!hk%616NSWiE0JUsHa``LW@N0N>?mT+`G6OqtzmMb zh&j`KcA#6uCSMTIfH4I`H5d;}wiLBz6rNluYR_a3@(oZ0P}pJePoQwZWJ@s+St(}E iDZvRbOk(muF>_7>9tdyMWJYmw&Kp7yUdiNxBJu#5v4*4o diff --git a/prog b/prog index 31b140a7875c8e234d3fe2abeebf6175898e7ec0..2f1e4cfbadc29a38e41e603a6acf8647dd10acb1 100755 GIT binary patch delta 3497 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 b{Mm}EDl`l~p~Rk)0J*E@lZ&u^^^E@j|6aBv delta 3309 zcmZ`+dr(x@8NX+j#k&hDyRfo*dF{i9>yt;K#Om@;*IuKrtPImBtrMJ5qqdGD1#1&g z6iC>tIN&$QXlte#GnIxuNH@)ZCV(*&=-`9?;i%OatfpO*Og5--F~-~P+<PwFCheKo z?>pb``+bjl?z#7#?Kw$WPm*?<*^$D@qgYYgP{+KJhDd^9MG`u$E!KA=D^>@XiO(5b zp;*!N|E+CW#eNp{5o<E<Q7pbx)!-~k4Gj=C`M()>mVpPoc8BGi)Rafr)xK2&n}xM! zM~0X0pZ~oja6s!8GB6{-Up&oB_ED*!SSFm;E+?D7A7=$eTm;;@U1S#=*L|0~C}Sp_ z4Q%n%Bp_Su@iww8^xODa0$F@5wDAIT^4WU{r{#`fb`wpD<Nb~|u}&QK8-`i7ZZ&eq zd5_ukX<PMJpF52<9qOv^ipg;nHc{7snFDOu`EmtdeDLYL0v4Da5uY-p7n=dU*IV;! z(>{)KuxK4(nXx#Fnt>PrqrnP^hD2j-45|eWqAL(BjzQyLJEA{Dv^)mo;VnduB3d1T z8sI#lBZ$_<pfllXL?0vC7=xN%QGyi~CL|i$W6)&Si0BUyJr;vnpbgOjh<3-Isqhh^ zA0j#sg9`8&q7#T-ib2yuH(lv*hfFU1P9eulN^|ap=9^w7OK|2zAj!U(<L)J8Jwp4( zxJ_g2jo+{<J)vInIs&UxGM@|K#=pOLagx1RUTLw-(~F4Mru!3B%c6C&#Gq~`owp3s z>7}tGdm|;DWg7VbnZIN|bfshv4-BPb&D)3&SHGZAZ1SYhsTlaQE>R46ve5|lel1Di z8cCAQ>6V0&EE7bSmqsar;bo5{Nep<SVi14S21}|(e@#%lC!i|zhW<Y86zcm3imfjd z{qm6{^}eFvxKnTAW7bDI>!%`2(4nTOr=-`XNtCXTuEQ5ro9*nBBn2z4i^0+{j0lT? z3pD@dap1IVo%J?4u_eWGW=u<62jSN?``$eTw2?EXoLH`pJ}0<lFIko5G+42RV&m^( zF|ny3!qqRrb$srB#1yia3s^~s*@-bd7|ez5M6vU8)14a->!%{zF%^$}wdtOMRl=ME z<9`C+XF_)Ibu2A<DkR(m&8<jh^VdF+@ePRA*+mc4Nw0NNtSRcKYY;tt>M0t33$6-# z3bN4A*w96iS}Zs_=k4Og6L8W#u9GEFaXux>dnl30CAExma4>BhISSX(=H{P3IOu&p z;O)V6y%P8s<yhb{UBTOQRTx$}h8$dUgfByNx<GycFQ-5C^eYdQg>P#3kmkibqb$j- zFWF2CRz_>Y1(rE(EK{co8y>=Fx;J^Y9M@vQ{nd|+a^d~p&T#J?et_wkJ~4?w*+rX3 z#Z19A4vE1x;!uihEe=#AfuX>t*fz_B@3_7i%z#{_bUn=xY~d+4XcF7J?V`*ye2ck` zGL>|_c&VHS7c-1xJKV@fBO4%^;U-hy%(Ur_A#WINW~Jr^Do5~kZo~H{ZEXgP58z&u z_oHI>V;(Mi13gIC49%HK$vrro=`-}<hl~bU?}H_4PFmB1Lku*81NFBDy^m=OD!LGN z%fXjrCktUmmeXobuIR}<NoqoO(EE6~_xA2icqc2z$b3EMYp2c46+SR46)F&lZL0#D z_C`(o12|zXGmPTLg|;z&627v(;4Yb@OQ5S`=;Rl2XynuuY^84mMSmBH@VoH3<1q2V zY^R3+Y;vZPhtS|G(Pt+q**3zUbG>17reg6C$aJmM?_uVjVTWsN%0g!S=yNQAx43=y zY-q&wj1h7Z#Y4Fxo5Ev~bOmcgQAbd3`G+JOM(w{PNj$F1?@+r@e{~z<QSbYwByB-m z^)E?kMSbaxBz2<x&V(clp<eKrBu${cg*p-M?lZ6`Zvh#C@8_kHMySu5oyTJ(yzc2i zzm|2>LcA6u)scad1NbX};XFIp4dW=gK%Z|XW|)_6cmDNLN!m$|58j!kS2e4Q@!IX$ z#2GwC;}&8b2W&;|HVEX;b`{)Z&xOj>{E<>Q2Xfnyd+{z@$aiTTPlP7(pXgygqj%G` zaHt<`wXuV2qS{A6@Yv1GE`^ORV|hejt;eq6N@1I4G3kUO9y=L?UQdphXWuNk@9A*E zl*gVtgy#u5=(n4W2oLiM%Sbo;qR>ui;Yi^Nga=Y|5v~+n63W>zLZK?xpuxjSBb+I= zk^#6{oFj1T=%I3U<AicJaF$p}6qc2o#EdsftY-DFrZVv$w(@yBy>rRPcfgA)t)vD5 zE1xILFuw9M)UC3Rco<z}6;c@IS6ND|pDl?C$Z9Ko>he&QQkhqUOtVJdOyz17MQ>&q zmf=gDj;o5|>g3o~=vZwP-e4R(yB|MboD-BI&<}`-OZ!&l59AD^RKk$gwl>0ex!>sE z0m~kmrKEk8U4s$#6}|omyMiA^9vu$Y=e3fj;XRaVWcfF_QWe}pWRr~SktI->cbw(9 z#ZGGSiv{y^GrTojPRng$b^k)6gv-pEY*W1QF30KL;rJS>;U@D=W`sUo^N57bi#6KN zv+Jt~xdcZ_bIhIcA(`V;JqTA3t;O9=hpJbAP?n?bW@tC~%L)t;X5scbRJPQt?n+g= z;cD4lzLB*G#Ak({`^@@d`2M5g7<Bjwpw(yM)u&jdJoK5T|8S^(JZeBF&(W(7O*8n* zA401?7k2qgFoeIu{#?DfF?ksE7bL6C4PT@bi*k^*;R&Agg^B`0&l&~%QVUfTOUWOg IqhjvA0hIZWxBvhE