diff --git a/travail_de_groupe/chef_oeuvre/src/fire.c b/travail_de_groupe/chef_oeuvre/src/fire.c index 61289d5cbc08e62603c62e46da4c5877bfc4b9f0..3082b7967a37f1ed86b225e74e7184c5b4f25789 100644 --- a/travail_de_groupe/chef_oeuvre/src/fire.c +++ b/travail_de_groupe/chef_oeuvre/src/fire.c @@ -190,4 +190,51 @@ void nextFire(listchainfire_t listFire){ listTemporary=listTemporary->next; } -} \ No newline at end of file +} + +listchainfire_t probabilitySpreadFire( listchainfire_t listFire, listchainfire_t listTemporary){ + int probability; + fire_t fire; + + probability= rand()%4; + printf("proba:%d\n", probability); + printf("listfire1: x%d,y%d\n",(listFire->fire).x,(listFire->fire).y); + + if((probability==0)&&((listTemporary->fire).x+1<MAPSIZE)){fire.state=1; + fire.x=(listTemporary->fire).x+1; + fire.y=(listTemporary->fire).y; + listFire=insertAheadFire(fire,listFire); + } + if ((probability==1)&&((listTemporary->fire).y+1<MAPSIZE)){fire.state=1; + fire.x=(listTemporary->fire).x; + fire.y=(listTemporary->fire).y+1; + listFire=insertAheadFire(fire,listFire); + } + if ((probability==2)&&((listTemporary->fire).y-1>=0)){fire.state=1; + fire.x=(listTemporary->fire).x; + fire.y=(listTemporary->fire).y-1; + listFire=insertAheadFire(fire,listFire); + } + if ((probability==3)&&((listTemporary->fire).x-1>=0)){fire.state=1; + fire.x=(listTemporary->fire).x-1; + fire.y=(listTemporary->fire).y; + listFire=insertAheadFire(fire,listFire); + } + printf("listtemp1: x%d,y%d\n",(listTemporary->fire).x,(listTemporary->fire).y); + printf("listfire2: x%d,y%d\n",(listFire->fire).x,(listFire->fire).y); + return listFire; +} + +listchainfire_t spreadFire (listchainfire_t listFire){ + listchainfire_t listTemporary=fireList; + srand(time(NULL)); + while (!emptyListFire(listTemporary)){ + if ((listTemporary->fire).state==4){ + + listFire=probabilitySpreadFire(listFire, listTemporary); + printf("listfire ajout: x%d,y%d\n",(listFire->fire).x,(listFire->fire).y); + } + listTemporary=listTemporary->next; + } + return listFire; +} \ 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 975fb32c8b02dcf758c617e56c8c41c763961fc3..ea537e23abfc605dd840f3d6685e4ba7a06581da 100644 --- a/travail_de_groupe/chef_oeuvre/src/fire.h +++ b/travail_de_groupe/chef_oeuvre/src/fire.h @@ -44,9 +44,12 @@ 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); +void travelFire(listchainfire_t ); void readFapFromFile(char * filename); void nextFire(listchainfire_t ); +listchainfire_t probabilitySpreadFire( listchainfire_t, listchainfire_t); +listchainfire_t spreadFire (listchainfire_t ); + diff --git a/travail_de_groupe/chef_oeuvre/src/render.c b/travail_de_groupe/chef_oeuvre/src/render.c index 035f2bee00a528b99dc2fc98a4c57e85510ecd26..38d69edff20b7fb066c87a8b111058b799d5d507 100644 --- a/travail_de_groupe/chef_oeuvre/src/render.c +++ b/travail_de_groupe/chef_oeuvre/src/render.c @@ -358,6 +358,8 @@ void mainLoop(){ case GAME: if ((int)timer % 20 == 0){ nextFire(fireList); + fireList=spreadFire(fireList); + printf("after spread fire : x%d,y%d\n",(fireList->fire).x,(fireList->fire).y); } drawGame(); break;