From 294dc98ac7215c73d74568c51c8c895c1f742fc5 Mon Sep 17 00:00:00 2001
From: valentin carmona <valentin.carmona@etu.u-bordeaux.fr>
Date: Sun, 13 Feb 2022 16:23:07 +0100
Subject: [PATCH] =?UTF-8?q?impl=C3=A9menttation=20de=20la=20commande=20w?=
 =?UTF-8?q?=20et=20prise=20en=20compte=20du=20chargement=20de=20partie=20c?=
 =?UTF-8?q?lose#6=20close#5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 game_text.c  | 16 ++++++++++++++--
 game_tools.c |  1 -
 2 files changed, 14 insertions(+), 3 deletions(-)

diff --git a/game_text.c b/game_text.c
index b505ea0..ff57f3b 100644
--- a/game_text.c
+++ b/game_text.c
@@ -4,6 +4,7 @@
 #include "game.h"
 #include "game_aux.h"
 #include "game_ext.h"
+#include "game_tools.h"
 
 #define NBCHARERR 4
 #define CHAR0ASCII 48
@@ -75,6 +76,7 @@ void printhelp(void) {
 	printf("l <i> <j> : Place une ampoule (*) à la position (<i>,<j>).\n");
 	printf("m <i> <j> : Place une marque (-) à la position (<i>,<j>).\n");
 	printf("b <i> <j> : Place une case vide ( ) à la position (<i>,<j>).\n");
+	printf("w <n> : Sauvegardez votre partie au nom <n>.\n");
 }
 
 void usage(char* argv[]) {
@@ -84,14 +86,19 @@ void usage(char* argv[]) {
 
 int main(int argc, char* argv[]) {
 	game g;
-	if (argc == 1)
+	if (argc == 1){
 		// Create new game
 		g = game_default();
-	else
+	}else if (argc == 2){
+		char* gameFile = argv[1];
+		g = game_load(gameFile);
+	}else{
 		usage(argv);
+	}
 	// init string for errors
 	char stringError[game_nb_rows(g) * game_nb_cols(g) * NBCHARERR];
 	char c;
+	char* fileSave = (char*)malloc(sizeof(char)*20);
 	// print game
 	game_print(g);
 	// test if game is over
@@ -137,6 +144,11 @@ int main(int argc, char* argv[]) {
 				case 'b':
 					checkPlayMove(g, S_BLANK);
 					break;
+				case 'w':
+					scanf(" %s", fileSave);
+					game_save(g, fileSave);
+					printf("Partie sauvegardée au nom %s\n", fileSave);
+					break;
 				default:
 					printf("Commande inconnue.\n");
 			}
diff --git a/game_tools.c b/game_tools.c
index 67e9ae2..08698a5 100644
--- a/game_tools.c
+++ b/game_tools.c
@@ -53,7 +53,6 @@ game game_load(char* filename) {
 		}
 	}
 	fclose(f);
-	game_print(g1);
 	return g1;
 }