From 666253eb3c23aeae25d71c3d9c361b109d0c2ad4 Mon Sep 17 00:00:00 2001 From: ozvann Date: Tue, 12 Nov 2024 23:24:16 +0100 Subject: [PATCH] Affichage de la grille faite en fonction de la taille selectionner par le joueur --- Makefile | 6 +++--- game | Bin 21184 -> 16992 bytes grille.c | 34 +++++++++++++++++++++++++++++----- grille.h | 2 +- jeu.c | 4 ---- menu.c | 6 +++--- taille.c | 3 --- 7 files changed, 36 insertions(+), 19 deletions(-) diff --git a/Makefile b/Makefile index e7225b8..5ca0ede 100644 --- a/Makefile +++ b/Makefile @@ -25,7 +25,7 @@ CFLAGS = -Wall -ansi -pedantic #deplacement.o : pion.h obstacle.h -menu.o : taille.h menu.h nbjoueur.h nbjoueur2.h boutonJVJ.h +menu.o : taille.h menu.h nbjoueur.h nbjoueur2.h boutonJVJ.h grille.h #pion.o : deplacement.h obstacle.h @@ -37,11 +37,11 @@ boutonJVJ.o : boutonJVJ.h nbjoueur2.o : nbjoueur2.h -grille.o : grille.h taille.h +grille.o : grille.h #obstacle.o : pion.h -jeu.o : jeu.h +jeu.o : jeu.h grille.h main.o : menu.h jeu.h diff --git a/game b/game index 73c1ce695deced319003d38bbfb09efa5b62cd68..85a213b587c32b31793334634aee133be6f8f6eb 100755 GIT binary patch delta 4755 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 Q$egpy62g<3{Ln`p0LUGF{{R30 delta 5568 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 diff --git a/grille.c b/grille.c index f78db24..a9509f3 100644 --- a/grille.c +++ b/grille.c @@ -1,10 +1,8 @@ #include +#include - -#include "taille.h" - - -void Grille(int taillegrille){ +/* +void Test(){ int x, y; int tabgrille[taillegrille + 2][taillegrille + 2]; for(x = 0; x < taillegrille + 2; x++){ @@ -21,3 +19,29 @@ void Grille(int taillegrille){ printf("\n"); } } +*/ + +void Grille(int taille){ + int bord = 0, x = 100, xx = 0, y = 100, yy = 100; + ChoisirCouleurDessin(CouleurParNom("Black")); + for(bord = 0; bord < taille; bord++){ + DessinerSegment(50, 100, x, 100); + x += 50; + } + x -= 50; + for(bord = 0; bord <= taille; bord++){ + DessinerSegment(50, 100, 50 , y); + DessinerSegment(x, 100, x, y); + y += 50; + } + y -= 50; + DessinerSegment(50, y, x, y); + for(bord = 0; bord <= taille; bord++){ + DessinerSegment(50, yy, x, yy); + yy += 50; + } + for(bord = 0; bord <= taille; bord++){ + DessinerSegment(xx, 100, xx, y); + xx += 50; + } +} diff --git a/grille.h b/grille.h index 46dcb66..c5fd477 100644 --- a/grille.h +++ b/grille.h @@ -3,7 +3,7 @@ -void Grille(int taillegrille); +void Grille(int taille); #endif diff --git a/jeu.c b/jeu.c index 90fad60..713c616 100644 --- a/jeu.c +++ b/jeu.c @@ -6,10 +6,6 @@ void GraphJeu(){ - int x = 50, y = 50, xx = 150, yy = 50, i = 0; printf("fichier jeu.c taille variable\n"); - for(i = 1; i < 9; i++){ - DessinerSegment(x, y * i, xx * i, yy * i); - } while(1){} } diff --git a/menu.c b/menu.c index a77a11e..ada00af 100644 --- a/menu.c +++ b/menu.c @@ -5,7 +5,7 @@ #include "nbjoueur.h" #include "nbjoueur2.h" #include "boutonJVJ.h" -#include "jeu.h" +#include "grille.h" int Menu() { @@ -40,7 +40,7 @@ int Menu() { printf("choix de menu %d\n", choix); FermerGraphique(); InitialiserGraphique(); - /* Demander a Luck quel est la taille de fenetre max qu'il peut voir sur son écran pour corriger les SAE */ - CreerFenetre(50, 50, 600, 600); + CreerFenetre(50, 50, 650, 650); + Grille(echotaille); return choix; } diff --git a/taille.c b/taille.c index 0ced844..af4baf0 100644 --- a/taille.c +++ b/taille.c @@ -2,8 +2,6 @@ #include -#include "grille.h" - /* Code permettant de choisir la taille de la grille en fonction du chiffre que l'utilisateur a entrer qui est compris entre 3 et 9 */ @@ -34,7 +32,6 @@ int GererChoixTaille(){ } if(taille != 0){ printf("Taille de taille.c = %d\n", taille); - Grille(taille); return taille; } }