diff --git a/travail_individuel/Belkhiri/GameOfLife/map.txt b/travail_individuel/Belkhiri/GameOfLife/map.txt index 461edd9ede9574c368e0a332b974a7cc4411ffe4..e1675d706023eec98ae79de728e946b3732dcfda 100644 --- a/travail_individuel/Belkhiri/GameOfLife/map.txt +++ b/travail_individuel/Belkhiri/GameOfLife/map.txt @@ -1,5 +1,20 @@ -0 0 0 0 0 -0 0 0 0 0 -0 1 0 1 0 -0 0 0 0 0 -0 0 0 0 0 +0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 +0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 +0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 +0 0 0 0 0 0 0 0 0 0 0 0 1 1 0 0 0 0 0 0 +0 0 0 0 0 1 1 0 0 0 0 1 0 0 1 0 0 0 0 0 +0 0 0 0 0 1 1 0 0 0 0 0 1 1 0 0 0 0 0 0 +0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 +0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 +0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 +0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 +0 0 0 0 0 1 1 0 0 0 0 0 0 0 0 0 0 0 0 0 +0 0 0 0 1 0 0 1 0 0 0 0 0 0 0 0 0 0 0 0 +0 0 0 0 0 1 1 0 0 0 0 0 0 0 0 0 0 0 0 0 +0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 +0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 +0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 +0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 +0 0 0 1 1 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 +0 0 0 1 1 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 +0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 diff --git a/travail_individuel/Belkhiri/GameOfLife/niveau.txt b/travail_individuel/Belkhiri/GameOfLife/niveau.txt new file mode 100644 index 0000000000000000000000000000000000000000..2abba445ada331c69fba8269989148b4e96fe1be --- /dev/null +++ b/travail_individuel/Belkhiri/GameOfLife/niveau.txt @@ -0,0 +1,21 @@ +20 +0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 +0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 +0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 +0 0 0 0 0 1 0 0 0 0 0 0 1 0 0 0 0 0 0 0 +0 0 0 0 1 1 1 0 0 0 0 0 1 0 0 0 0 0 0 0 +0 0 0 0 0 0 0 0 0 0 0 0 1 0 0 0 0 0 0 0 +0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 +0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 +0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 +0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 +0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 +0 0 0 0 1 1 1 1 0 0 0 0 0 0 0 0 0 0 0 0 +0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 +0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 +0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 +0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 +0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 1 0 0 0 +0 0 0 1 1 0 0 0 0 0 0 0 0 0 1 0 1 0 0 0 +0 0 0 1 1 0 0 0 0 0 0 0 0 0 0 1 1 0 0 0 +0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 \ No newline at end of file diff --git a/travail_individuel/Belkhiri/GameOfLife/run b/travail_individuel/Belkhiri/GameOfLife/run index 6f7bac53ad19988d9b9c8582eb4bb0c0f8d3234f..2c5ecb423a6c0ea008391fc6cd62739890144d7e 100755 Binary files a/travail_individuel/Belkhiri/GameOfLife/run and b/travail_individuel/Belkhiri/GameOfLife/run differ diff --git a/travail_individuel/Belkhiri/GameOfLife/src/main.c b/travail_individuel/Belkhiri/GameOfLife/src/main.c index 8c8553a1a206661f247725e56df879225b011864..4ddfe75d73c117bd3ce0eb10b6074e221669f48d 100644 --- a/travail_individuel/Belkhiri/GameOfLife/src/main.c +++ b/travail_individuel/Belkhiri/GameOfLife/src/main.c @@ -4,10 +4,18 @@ int running; int game_state; -int main(){ +int main(int argc, char** argv){ running = 1; game_state = MENU; + initMap(); + + if(argc == 3){ + game_state = GAME; + chargeNiveauFichier(argv[2], map, atoi(argv[1])); + printf("3 arg\n"); + } + MainLoop(); } \ No newline at end of file diff --git a/travail_individuel/Belkhiri/GameOfLife/src/map.c b/travail_individuel/Belkhiri/GameOfLife/src/map.c index 29713a65d5bd051ec1ad3887d987cd5525de4fdb..b1de396136e3083db4d717de4ae7542fa72b9225 100644 --- a/travail_individuel/Belkhiri/GameOfLife/src/map.c +++ b/travail_individuel/Belkhiri/GameOfLife/src/map.c @@ -62,4 +62,36 @@ long long int MapToBinary(int ** map) } } return binary; +} + +void chargeNiveauFichier(char *nom_fichier, int ** monde, int nbrLigne){ + FILE *fichier = NULL; + int valeur; + int ligne = -1; + int colonne = 0; + + fichier = fopen(nom_fichier, "r"); + if(fichier != NULL){ + while(fscanf(fichier, "%d", &valeur) != EOF){ + if(ligne == -1){ + MAPSIZE = valeur; + if(MAPSIZE != nbrLigne){ + printf("PROBLEME DE DIMENSION\n"); + return; + } + ligne = 0; + }else{ + map[ligne][colonne] = valeur; + colonne = colonne + 1; + if(colonne==MAPSIZE){ + ligne = ligne + 1; + colonne = 0; + if(ligne==MAPSIZE){ + break; + } + } + } + } + } + fclose(fichier); } \ No newline at end of file diff --git a/travail_individuel/Belkhiri/GameOfLife/src/map.h b/travail_individuel/Belkhiri/GameOfLife/src/map.h index 7a47a8b2fb659c76aafa9d2b53ac8f09b8584c7a..d0408906dde3c54a561860d8597d64c99ca4fde1 100644 --- a/travail_individuel/Belkhiri/GameOfLife/src/map.h +++ b/travail_individuel/Belkhiri/GameOfLife/src/map.h @@ -10,5 +10,6 @@ void printMap(); void initMap(); void writeMap(char* filename); long long int MapToBinary(int ** map); +void chargeNiveauFichier(char *, int **, int); #endif \ No newline at end of file