From 883aff1becf6d426d5c41c36edd1d493f75583f6 Mon Sep 17 00:00:00 2001 From: abraham Date: Mon, 18 Nov 2024 16:15:25 +0100 Subject: [PATCH] echange de pc --- comportementJCJ.c | 22 ++++++---------------- comportementJCJ.h | 2 +- game | Bin 25616 -> 0 bytes jeu.c | 16 +++++++++++++--- jeu.h | 2 +- main.c | 3 ++- 6 files changed, 23 insertions(+), 22 deletions(-) delete mode 100755 game diff --git a/comportementJCJ.c b/comportementJCJ.c index f58cc61..0e47de5 100644 --- a/comportementJCJ.c +++ b/comportementJCJ.c @@ -10,7 +10,7 @@ #include "verificationblock.h" -void compJCJ(int taille){ +int compJCJ(int taille){ int fin = 0, tabx = 0, taby = 0, tour = 0, initi = 0, SourisX = 0, SourisY = 0, x = 50, y = 100, initialiser = 0; int maxX = 0, maxY = 0, joueurx1 = 0, joueury1 = 0, joueurx2 = 0, joueury2 = 0, placer = 1; int emplacementcooX1 = 0, emplacementcooX2 = 0, emplacementcooY1 = 0, emplacementcooY2 = 0; @@ -44,12 +44,6 @@ void compJCJ(int taille){ initialiser++; SourisX = 0; SourisY = 0; - for(tabx = 0; tabx < taille + 2; tabx++){ - for(taby = 0; taby < taille + 2; taby++){ - printf("%d", grille[tabx][taby]); - } - printf("\n"); - } Efface(); EcrireTexte(30, 40, "Joueur 2 choisissez l'emplacement de base du pion 2", 1); } @@ -68,13 +62,6 @@ void compJCJ(int taille){ } SourisX = 0; SourisY = 0; - for(tabx = 0; tabx < taille + 2; tabx++){ - for(taby = 0; taby < taille + 2; taby++){ - printf("%d", grille[tabx][taby]); - } - printf("\n"); - } - } } } @@ -92,8 +79,11 @@ void compJCJ(int taille){ SourisY = _Y; } VerifBlock1(SourisX, SourisY, maxX, maxY, taille, empperso); + if(grille[joueury1+1 != 0 && joueury1-1 != 0 && joueurx1+1 != 0 && joueurx1-1 != 0){ + printf("\n\nechec\n\n"); + } if(empperso[0] != 0){ - if(grille[empperso[1]][empperso[0]] == 0){ + if(grille[empperso[1]][empperso[0]] == 0 && (empperso[1] <= joueury1+1 && empperso[1] >= joueury1-1) && (empperso[0] <= joueurx1+1 && empperso[0] >= joueurx1-1)){ grille[joueury1][joueurx1] = 0; ChoisirCouleurDessin(CouleurParNom("white")); RemplirRectangle(emplacementcooX1, emplacementcooY1, 40, 40); @@ -163,7 +153,7 @@ void compJCJ(int taille){ } VerifBlock1(SourisX, SourisY, maxX, maxY, taille, empperso); if(empperso[0] != 0){ - if(grille[empperso[1]][empperso[0]] == 0){ + if(grille[empperso[1]][empperso[0]] == 0 && (empperso[1] <= joueury2+1 && empperso[1] >= joueury2-1) && (empperso[0] <= joueurx2+1 && empperso[0] >= joueurx2-1)){ grille[joueury2][joueurx2] = 0; ChoisirCouleurDessin(CouleurParNom("white")); RemplirRectangle(emplacementcooX2, emplacementcooY2, 40, 40); diff --git a/comportementJCJ.h b/comportementJCJ.h index c96db1e..52fb677 100644 --- a/comportementJCJ.h +++ b/comportementJCJ.h @@ -2,7 +2,7 @@ #define COMPORTEMENTJCJ_H -void compJCJ(int taille); +int compJCJ(int taille); #endif diff --git a/game b/game deleted file mode 100755 index 3b6329bd3cbf47b6082ad3d505af330658159ef7..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 25616 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 SVSE@}77byEp=m(lG5`Sa(Z~G& diff --git a/jeu.c b/jeu.c index 8f58392..457ed48 100644 --- a/jeu.c +++ b/jeu.c @@ -4,13 +4,23 @@ #include "comportementJCJ.h" #include "comportementJCIA.h" -void Jeu(){ - int choix[2], taille = 0; +int Jeu(){ + int choix[2], taille = 0, victoire = 0; Menu(choix); taille = choix[1]; if(choix[0] == 1){ - compJCJ(taille); + victoire = compJCJ(taille); + if(victoire == 1){ + return 1; + }else if(victoire == 2){ + return 2; + } }else if (choix[0] == 2){ compJCIA(taille); + if(victoire == 1){ + return 1; + }else if(victoire == 3){ + return 3; + } } } diff --git a/jeu.h b/jeu.h index f27f0fa..5d25167 100644 --- a/jeu.h +++ b/jeu.h @@ -2,7 +2,7 @@ #define JEU_H -void GraphJeu(); +int GraphJeu(); #endif diff --git a/main.c b/main.c index 0085ac2..428f482 100644 --- a/main.c +++ b/main.c @@ -3,8 +3,9 @@ #include "jeu.h" int main (void){ + int victoire = 0; InitialiserGraphique(); CreerFenetre(50, 50, 700, 500); /* Initialise la fenetre puis lance le programme jeu.c qui lancera d'autre programme */ EffacerEcran(CouleurParNom("white")); - Jeu(); + victoire = Jeu(); }