From 36dd0ac17aa0cb7f940849ef3b6d191af1f3e276 Mon Sep 17 00:00:00 2001 From: ozvann Date: Mon, 4 Nov 2024 19:36:24 +0100 Subject: [PATCH] ajout dans la makefiles grille.c + test pour les fichier.h --- Makefile | 5 ++--- game | Bin 16400 -> 0 bytes grille.c | 9 +++++++++ grille.h | 9 +++++++++ main.c | 9 +++------ menu.c | 2 +- taille.c | 10 +--------- 7 files changed, 25 insertions(+), 19 deletions(-) delete mode 100755 game diff --git a/Makefile b/Makefile index 1003467..1d8ace3 100644 --- a/Makefile +++ b/Makefile @@ -6,6 +6,7 @@ but : game OFILES = taille.o \ menu.o \ + grille.o \ main.o @@ -24,11 +25,9 @@ menu.o : taille.h menu.h #pion.o : deplacement.h obstacle.h -#taille.o : grille.h - taille.o : taille.h -#grille.o : menu.h +grille.o : taille.h #obstacle.o : pion.h diff --git a/game b/game deleted file mode 100755 index f9a6037dbbbe9b88ee0f33a0f48620e3c1b60e4d..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 16400 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 diff --git a/grille.c b/grille.c index e69de29..80f145a 100644 --- a/grille.c +++ b/grille.c @@ -0,0 +1,9 @@ +#include + + +#include "taille.h" +#include "grille.h" + +int Grille(taillegrille){ + return 0; +} diff --git a/grille.h b/grille.h index e69de29..415228b 100644 --- a/grille.h +++ b/grille.h @@ -0,0 +1,9 @@ +#ifndef GRILLE_H +#define GRILLE_H + + + +int Grille(taillegrille); + + +#endif diff --git a/main.c b/main.c index d6f1896..27a8a4f 100644 --- a/main.c +++ b/main.c @@ -9,15 +9,12 @@ int main (void){ - int taillegrille = 0, x = 0; InitialiserGraphique(); CreerFenetre(10, 10, 600, 300); EffacerEcran(CouleurParNom("white")); - while(taillegrille == 0){ - Menu(); - printf("%d %d\n", x, taillegrille); + Menu(); + while(1){ GererChoixTaille(); - x++; - } + } return EXIT_SUCCESS; } diff --git a/menu.c b/menu.c index 95e940b..e18efc8 100644 --- a/menu.c +++ b/menu.c @@ -13,5 +13,5 @@ void Menu() { EcrireTexte(x, y, "Taille de grille entre 3 et 9 :", 2); /* Implémentation du texte */ y = y + 50; ChoisirCouleurDessin(CouleurParNom("red")); - EcrireTexte(x, y, "Attente du choix de l'utilisateur...", 2); + EcrireTexte(x, y, "Attente du choix de l'utilisateur...", 2); } diff --git a/taille.c b/taille.c index de4258a..d553663 100644 --- a/taille.c +++ b/taille.c @@ -9,39 +9,31 @@ int GererChoixTaille(){ - int taillegrille = 0; + int taillegrille; if(ToucheEnAttente()){ KeySym touchPresse = Touche(); /* Prend en compte la touche presser et renvoie la touche presser */ if(touchPresse == XK_KP_3){ taillegrille = 3; printf("%d", taillegrille); - return taillegrille; } else if(touchPresse == XK_KP_4){ taillegrille = 4; printf("%d", taillegrille); - return taillegrille; } else if(touchPresse == XK_KP_5){ taillegrille = 5; printf("%d", taillegrille); - return taillegrille; } else if(touchPresse == XK_KP_6){ taillegrille = 6; printf("%d", taillegrille); - return taillegrille; } else if(touchPresse == XK_KP_7){ taillegrille = 7; printf("%d", taillegrille); - return taillegrille; } else if(touchPresse == XK_KP_8){ taillegrille = 8; printf("%d", taillegrille); - return taillegrille; } else if(touchPresse == XK_KP_9){ taillegrille = 9; printf("%d", taillegrille); - return taillegrille; } } return taillegrille; - printf("test\n"); }