From c2bdc1d42c61b577280e94089cd55302b7386b8f Mon Sep 17 00:00:00 2001
From: Efe ERKEN <efe.erken@etu.unistra.fr>
Date: Wed, 9 Nov 2022 08:59:25 +0100
Subject: [PATCH] :wrench: UPDATE: Rename funcs and update struct

Renamed init_level subfunctions and updated enum CaseType structure.
---
 grid.c |  6 +++---
 grid.h |  8 +++++---
 test.c | 12 ++++++------
 3 files changed, 14 insertions(+), 12 deletions(-)

diff --git a/grid.c b/grid.c
index e60ab8e..f3142da 100644
--- a/grid.c
+++ b/grid.c
@@ -4,7 +4,7 @@
 #include "grid.h"
 #include "player.h"
 
-grid *creer_grid(int row, int column)
+grid *creer_level(int row, int column)
 {
     grid *G = (grid *)malloc(sizeof(grid));
     if (G == NULL)
@@ -32,7 +32,7 @@ grid *creer_grid(int row, int column)
     return G;
 }
 
-void free_grid(grid *G)
+void free_level(grid *G)
 {
     for (int i = 0; i < G->row_number; i++)
     {
@@ -59,7 +59,7 @@ grid *init_level(const char *file_path)
     fgets(line, 100, file);
     sscanf(line, "%d %d %d", &number_column, &number_row, &number_goals);
 
-    grid *level = creer_grid(number_row, number_column);
+    grid *level = creer_level(number_row, number_column);
 
     int current_row = 0;
     // int current_goal = 0;
diff --git a/grid.h b/grid.h
index d3eb152..4a1f03c 100644
--- a/grid.h
+++ b/grid.h
@@ -9,7 +9,9 @@ enum CaseType
     BOX = '$',
     PLAYER = '@',
     GOAL = '.',
-    NONE = ' '
+    NONE = ' ',
+    BOX_GOAL = '*',
+    PLAYER_GOAL = '+'
 };
 
 /**
@@ -27,9 +29,9 @@ typedef struct Grid
 
 grid *init_level(const char *file_path);
 
-grid *creer_grid(int row, int column);
+grid *creer_level(int row, int column);
 
-void free_grid(grid *G);
+void free_level(grid *G);
 
 void display(grid *G);
 
diff --git a/test.c b/test.c
index 99ebc4c..b074508 100644
--- a/test.c
+++ b/test.c
@@ -6,11 +6,11 @@
 
 int main01()
 {
-    // Test des fonctions creer_grid() et free_grid() dans grid.c
+    // Test des fonctions creer_level() et free_level() dans grid.c
     int row = 11;
     int column = 26;
 
-    grid* level = creer_grid(row, column);
+    grid* level = creer_level(row, column);
     level->game_grid[0][0] = '#';
     level->game_grid[3][1] = '@';
 
@@ -20,7 +20,7 @@ int main01()
     printf("Grid block at coordinates (0,0) %c\n", level->game_grid[0][0]);
     printf("Grid block at coordinates (1,3) %c\n", level->game_grid[3][1]);
 
-    free_grid(level);
+    free_level(level);
     return 0;
 }
 
@@ -34,7 +34,7 @@ int main02() {
     printf("Grid block at coordinates (7,2): %c\n", level->game_grid[2][7]);
     printf("Player coordinates at start: (%d, %d)\n", level->player.x, level->player.y);
 
-    free_grid(level);
+    free_level(level);
     return 0;
 }
 
@@ -42,7 +42,7 @@ int main03() {
     // Test de la fonction display() dans grid.c
     grid* level = init_level("level1.txt");
     display(level);
-    free_grid(level);
+    free_level(level);
     return 0;
 }
 
@@ -58,6 +58,6 @@ int main() {
         scanf(" %c", &quitCar);
         move_player(level, quitCar);
     }
-    free_grid(level);
+    free_level(level);
     return 0;
 }
-- 
GitLab