diff --git a/travail_de_groupe/chef_oeuvre/src/fire.c b/travail_de_groupe/chef_oeuvre/src/fire.c index ae254e143506d448d271a7311293975f22a1bade..b3d7e9797ac3f0418cdd5bb1a718b79b13df913b 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 851423fb3baf8be731b2ebdd59ca530322079345..600b839a375340df80a2d9eaed50df00fbf672ce 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 5b23e5321ad0db2016014b8e655c5ca254da132a..b6868c9fa9b7b35e119c484f7e75d7fbe5a582fb 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 f543c0e607b9cec9fd2f060b58aa22457d67f365..d36bff9958397cf10a8c0527bffb95a5e9f6c76b 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; }