From ea11a665508fb96d8b819ae50121bc8f1de66494 Mon Sep 17 00:00:00 2001
From: maberet <maberet@turing.local.isima.fr>
Date: Wed, 22 Jun 2022 15:46:29 +0200
Subject: [PATCH] =?UTF-8?q?G=C3=A9n=C3=A9ration=20du=20feu'?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 travail_de_groupe/chef_oeuvre/src/fire.c   | 17 ++++++++++++++---
 travail_de_groupe/chef_oeuvre/src/fire.h   |  1 +
 travail_de_groupe/chef_oeuvre/src/main.c   |  1 +
 travail_de_groupe/chef_oeuvre/src/render.c |  4 ++--
 4 files changed, 18 insertions(+), 5 deletions(-)

diff --git a/travail_de_groupe/chef_oeuvre/src/fire.c b/travail_de_groupe/chef_oeuvre/src/fire.c
index ae254e1..b3d7e97 100644
--- a/travail_de_groupe/chef_oeuvre/src/fire.c
+++ b/travail_de_groupe/chef_oeuvre/src/fire.c
@@ -45,16 +45,17 @@ listchainfire_t startFire(listchainfire_t listFire,int numberFire, int mapSize){
     int i; 
     int xFire=0;
     int yFire=0;
+    srand(time(NULL));
 
     fire_t fire;
 
     if (emptyListFire(listFire)){
         for (i=0;i<numberFire;i++){
-            srand(time(NULL));
+            
             xFire= rand()%mapSize;
-            srand(time(NULL));
-            yFire= rand()%mapSize;
 
+            yFire= rand()%mapSize;
+            printf("xf:%d,yf:%d\n",xFire,yFire);
             fire.x= xFire;
             fire.y= yFire; 
             fire.state=1;
@@ -126,3 +127,13 @@ listchainfire_t offFire (listchainfire_t listFire, int x ,int y ){
     }
     return listFire; 
 }
+
+void travelFire(listchainfire_t listFire){
+    listchainfire_t listTemporary=listFire;
+
+    while(listTemporary!=NULL){
+        printf("x:%d,y:%d\n",(listTemporary->fire).x,(listTemporary->fire).y);
+        listTemporary=listTemporary->next;
+    }
+    //freeListFire(listTemporary);
+}
\ No newline at end of file
diff --git a/travail_de_groupe/chef_oeuvre/src/fire.h b/travail_de_groupe/chef_oeuvre/src/fire.h
index 851423f..600b839 100644
--- a/travail_de_groupe/chef_oeuvre/src/fire.h
+++ b/travail_de_groupe/chef_oeuvre/src/fire.h
@@ -38,5 +38,6 @@ listchainfire_t deleteAheadFire(listchainfire_t);
 listchainfire_t deleteFire (listchainfire_t, int ,int );
 listchainfire_t freeListFire (listchainfire_t );
 listchainfire_t offFire (listchainfire_t, int,int );
+void travelFire(listchainfire_t listFire);
 
 #endif
\ No newline at end of file
diff --git a/travail_de_groupe/chef_oeuvre/src/main.c b/travail_de_groupe/chef_oeuvre/src/main.c
index 5b23e53..b6868c9 100644
--- a/travail_de_groupe/chef_oeuvre/src/main.c
+++ b/travail_de_groupe/chef_oeuvre/src/main.c
@@ -9,5 +9,6 @@ int main(){
     gameState = MENU;
     readMapFromFile("map.txt");
     fireList = startFire(fireList,10,MAPSIZE);
+    travelFire(fireList);
     mainLoop();
 } 
\ No newline at end of file
diff --git a/travail_de_groupe/chef_oeuvre/src/render.c b/travail_de_groupe/chef_oeuvre/src/render.c
index f543c0e..d36bff9 100644
--- a/travail_de_groupe/chef_oeuvre/src/render.c
+++ b/travail_de_groupe/chef_oeuvre/src/render.c
@@ -147,8 +147,8 @@ void drawFire(){
         SDL_Rect rect;
         rect.h = CELLSIZE;
         rect.w = CELLSIZE;
-        rect.x = (cour->fire).x + (screenDimension.w - (MAPSIZE * CELLSIZE)) / 2;
-        rect.y = (cour->fire).y ;
+        rect.x = (cour->fire).x*CELLSIZE + (screenDimension.w - (MAPSIZE * CELLSIZE)) / 2;
+        rect.y = (cour->fire).y*CELLSIZE ;
         SDL_RenderCopy(renderer, treeTexture, NULL, &rect);
         cour = cour->next;
     }
-- 
GitLab