From c3d91aa989e67333cfed86e4efe51dd15340fd28 Mon Sep 17 00:00:00 2001 From: khadir Date: Tue, 12 Nov 2024 16:06:34 +0100 Subject: [PATCH 1/2] toute petite modif --- #Makefile# | 65 +++++++++++++++++++++++++++++++++++++++++++++++++++++ .#Makefile | 1 + game | Bin 0 -> 16656 bytes menu.c | 2 +- 4 files changed, 67 insertions(+), 1 deletion(-) create mode 100644 #Makefile# create mode 120000 .#Makefile create mode 100755 game diff --git a/#Makefile# b/#Makefile# new file mode 100644 index 0000000..e7225b8 --- /dev/null +++ b/#Makefile# @@ -0,0 +1,65 @@ +# CHAPITRE 1 : BUT FINAL + +but : game + +# CHAPITRE 2 : VARIABLES + +OFILES = taille.o \ + menu.o \ + grille.o \ + nbjoueur.o \ + nbjoueur2.o \ + boutonJVJ.o \ + jeu.o \ + main.o + + +#deplacement.o, pion.o, obstacle.o + + +CC = gcc + +CFLAGS = -Wall -ansi -pedantic + +# CHAPITRE 3 : DEPENDANCES (REGLES IMPLICITES) + +#deplacement.o : pion.h obstacle.h + +menu.o : taille.h menu.h nbjoueur.h nbjoueur2.h boutonJVJ.h + +#pion.o : deplacement.h obstacle.h + +taille.o : taille.h jeu.h + +nbjoueur.o : nbjoueur.h + +boutonJVJ.o : boutonJVJ.h + +nbjoueur2.o : nbjoueur2.h + +grille.o : grille.h taille.h + +#obstacle.o : pion.h + +jeu.o : jeu.h + +main.o : menu.h jeu.h + + +# CHAPITRE 4 : DEPENDANCES AVEC COMMANDES + +game : $(OFILES) + $(CC) $(CFLAGS) -o game $(OFILES) -lgraph + +# CHAPITRE 5 : NETTOYAGE DES FICHIERS GENERES + +clean : + -rm -f $(OFILES) game + +# CHAPITRE 6 : BUTS FACTICES + +.PHONY : but clean + +run : + ./game + diff --git a/.#Makefile b/.#Makefile new file mode 120000 index 0000000..b86a70b --- /dev/null +++ b/.#Makefile @@ -0,0 +1 @@ +khadir@salle222-07.122283:1731070080 \ No newline at end of file diff --git a/game b/game new file mode 100755 index 0000000000000000000000000000000000000000..eb7ef4e74574c0ff5decded6df3bac2fb91d897c GIT binary patch literal 16656 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 AaR2}S literal 0 HcmV?d00001 diff --git a/menu.c b/menu.c index 89a561e..d3bac03 100644 --- a/menu.c +++ b/menu.c @@ -45,6 +45,6 @@ int Menu() { 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, 100*echotaille, 100*echotaille); + CreerFenetre(50, 50, 600, 600); return choix; } From c67732ad59bb7cc3fbfa3162eebed84330c6ae59 Mon Sep 17 00:00:00 2001 From: khadir Date: Tue, 12 Nov 2024 16:08:24 +0100 Subject: [PATCH 2/2] toute petite modif --- #Makefile# | 65 ----------------------------------------------------- game | Bin 16656 -> 0 bytes 2 files changed, 65 deletions(-) delete mode 100644 #Makefile# delete mode 100755 game diff --git a/#Makefile# b/#Makefile# deleted file mode 100644 index e7225b8..0000000 --- a/#Makefile# +++ /dev/null @@ -1,65 +0,0 @@ -# CHAPITRE 1 : BUT FINAL - -but : game - -# CHAPITRE 2 : VARIABLES - -OFILES = taille.o \ - menu.o \ - grille.o \ - nbjoueur.o \ - nbjoueur2.o \ - boutonJVJ.o \ - jeu.o \ - main.o - - -#deplacement.o, pion.o, obstacle.o - - -CC = gcc - -CFLAGS = -Wall -ansi -pedantic - -# CHAPITRE 3 : DEPENDANCES (REGLES IMPLICITES) - -#deplacement.o : pion.h obstacle.h - -menu.o : taille.h menu.h nbjoueur.h nbjoueur2.h boutonJVJ.h - -#pion.o : deplacement.h obstacle.h - -taille.o : taille.h jeu.h - -nbjoueur.o : nbjoueur.h - -boutonJVJ.o : boutonJVJ.h - -nbjoueur2.o : nbjoueur2.h - -grille.o : grille.h taille.h - -#obstacle.o : pion.h - -jeu.o : jeu.h - -main.o : menu.h jeu.h - - -# CHAPITRE 4 : DEPENDANCES AVEC COMMANDES - -game : $(OFILES) - $(CC) $(CFLAGS) -o game $(OFILES) -lgraph - -# CHAPITRE 5 : NETTOYAGE DES FICHIERS GENERES - -clean : - -rm -f $(OFILES) game - -# CHAPITRE 6 : BUTS FACTICES - -.PHONY : but clean - -run : - ./game - diff --git a/game b/game deleted file mode 100755 index eb7ef4e74574c0ff5decded6df3bac2fb91d897c..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 16656 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 AaR2}S