From 42fbdd610cac19e4d746c8d21294d54c66ac16c0 Mon Sep 17 00:00:00 2001 From: Come Thuret Date: Sun, 11 Dec 2022 13:44:51 +0100 Subject: [PATCH] =?UTF-8?q?ajout=20de=20l'=C3=A9cran=20de=20victoire=20et?= =?UTF-8?q?=20suppression=20du=20menu=20des=20themes?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- affichage.c | 4 +- affichage.o | Bin 0 -> 8824 bytes menu_v2.c | 108 +++++++--------------------------------------------- 3 files changed, 17 insertions(+), 95 deletions(-) create mode 100644 affichage.o diff --git a/affichage.c b/affichage.c index 007dfba..6f5f1b4 100644 --- a/affichage.c +++ b/affichage.c @@ -245,7 +245,9 @@ int essay(int grille_x){ } if (Victoire(found,grille_x,4)){ - printf("Victoire !\n"); + ChargerImageFond("./background/ecran-victoire.png"); + while(Touche()!=XK_space){ + } break; } diff --git a/affichage.o b/affichage.o new file mode 100644 index 0000000000000000000000000000000000000000..3514b05fc094ba15ceba4a843c7e48b2156c8317 GIT binary patch literal 8824 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 DNXX7k literal 0 HcmV?d00001 diff --git a/menu_v2.c b/menu_v2.c index b1b870b..6feea71 100644 --- a/menu_v2.c +++ b/menu_v2.c @@ -39,106 +39,26 @@ int menu_principal(void){ break; } - //affichage du menu theme + //affichage du menu difficultée if((x>384) && (x<1114) && (y>384) && (y<459)){ - ChargerImageFond("./background/menu-theme.png"); - - ToucheEnAttente(); + ChargerImageFond("./background/menu-difficultee.png"); + while(1){ - SourisPosition(); - x=_X; - y=_Y; - - //affichage du menu sur le boutton retour - if((x>1194) && (x<1399) && (y>45) && (y<121)){ - ChargerImageFond("./background/menu-theme-retour.png"); - } - - //affichage du menu theme - else{ - ChargerImageFond("./background/menu-theme.png"); - } - - if (SourisCliquee()){ + if(SourisCliquee()){ x=_X; y=_Y; - - //retour au menu principal - if((x>1194) && (x<1399) && (y>45) && (y<121)){ - menu_principal(); + + if((x>68) && (x<488) && (y>266) && (y<696)){ + FermerGraphique(); + essay(3); } - - //affichage du menu difficultée du theme n°1 - if((x>66) && (x<491) && (y>356) && (y<781)){ - ChargerImageFond("./background/menu-difficultee.png"); - - while(1){ - if(SourisCliquee()){ - x=_X; - y=_Y; - - if((x>68) && (x<488) && (y>266) && (y<696)){ - FermerGraphique(); - essay(3); - } - if((x>537) && (x<958) && (y>266) && (y<696)){ - FermerGraphique(); - essay(4); - } - if((x>1007) && (x<1432) && (y>266) && (y<696)) { - FermerGraphique(); - essay(5); - } - } - } + if((x>537) && (x<958) && (y>266) && (y<696)){ + FermerGraphique(); + essay(4); } - - //affichage du menu difficultée du theme n°2 - if((x>535) && (x<960) && (y>356) && (y<781)){ - ChargerImageFond("./background/menu-difficultee.png"); - - while(1){ - if(SourisCliquee()){ - x=_X; - y=_Y; - if((x>68) && (x<488) && (y>266) && (y<696)){ - FermerGraphique(); - essay(3); - } - if((x>537) && (x<958) && (y>266) && (y<696)){ - FermerGraphique(); - essay(4); - } - if((x>1007) && (x<1432) && (y>266) && (y<696)) { - FermerGraphique(); - essay(5); - } - } - } - } - - //affichage du menu difficultée du theme 3 - if((x>1005) && (x<1430) && (y>356) &&(y<781)){ - ChargerImageFond("./background/menu-difficultee.png"); - - while(1){ - if(SourisCliquee()){ - x=_X; - y=_Y; - if((x>68) && (x<488) && (y>266) && (y<696)){ - FermerGraphique(); - essay(3); - } - if((x>537) && (x<958) && (y>266) && (y<696)){ - FermerGraphique(); - essay(4); - } - if((x>1007) && (x<1432) && (y>266) && (y<696)) { - FermerGraphique(); - essay(5); - } - } - } + if((x>1007) && (x<1432) && (y>266) && (y<696)) { + FermerGraphique(); + essay(5); } } }