Skip to content
Snippets Groups Projects
Commit e3261f9e authored by Montjoie Henri's avatar Montjoie Henri
Browse files

merge

parents 178826cf f28700fa
No related branches found
No related tags found
No related merge requests found
Pipeline #
MAP1 10*16
MFMMMFFPPF
PFFFFFFPPF
PFPPPFFPPF
PFPPPFFPPF
PFPPFFFPPF
PFMMMFFPPF
PFMFFFFPPF
PFMMPFFPPF
PFPPPFFPPF
PFPPFFPPFP
PFFPPFFPPF
PFFFMFFPPF
PFPMMFFPPF
PFMMMFFPPF
PFFFPFFPPF
PFPPPPFPPF
MAP2 10*16
FFMMMFFPPF
PFFFFFFPPF
PFPPPFFPPF
PFPPPFFPPF
PFPPFFFPPF
PFMMMFFPPF
PFMFFFFPPF
PFMMPFFPPF
PFPPPFFPPF
PFPPFFPPFP
PFFPPFFPPF
PFFFMFFPPF
PFPMMFFPPF
PFMMMFFPPF
PFFFPFFPPF
PFPPPPFPPF
MAP3 10*16
FFMMMFFPPF
PFFFFFFPPF
PFPPPFFPPF
PFPPPFFPPF
PFPPFFFPPF
PFMMMFFPPF
PFMFFFFPPF
PFMMPFFPPF
PFPPPFFPPF
PFPPFFPPFP
PFFPPFFPPF
PFFFMFFPPF
PFPMMFFPPF
PFMMMFFPPF
PFFFPFFPPF
PFPPPPFPPF
MAP4 10*16
FFMMMFFPPF
PFFFFFFPPF
PFPPPFFPPF
PFPPPFFPPF
......
......@@ -18,29 +18,65 @@
*/
char* LireCarte(const char *filename, int num)
{
char char_num_map[2],char_nb_lignes[2]="",char_nb_colonnes[2]="";
int num_map = 0, nb_lignes = 0, nb_colonnes = 0, i=0, j=0, k=0;
FILE* file_map = NULL;
char char_nb_lignes[2]="",char_nb_colonnes[2]="";
int nb_lignes = 0, nb_colonnes = 0, i=0, j=0;
char map[10][16];
file_map = fopen(filename, "r");
fseek(file_map, 5, SEEK_SET);
fseek(file_map, 3, SEEK_SET);
(fgets(char_num_map,3,file_map));
num_map = atoi(char_num_map);
(fgets(char_nb_lignes,3,file_map));
nb_lignes = atoi(char_nb_lignes);
fseek(file_map, 1, SEEK_CUR);
(fgets(char_nb_colonnes,3,file_map));
nb_colonnes = atoi(char_nb_colonnes);
printf("Nb map = %d, Nb colonne = %d, Nb ligne = %d\n\n",num_map,nb_colonnes,nb_lignes);
//num_map++;
while(num_map < num)
{
for(k=0; k<nb_colonnes+4; k++) /*! Descend jusqu' la prochaine map */
{
fseek(file_map,nb_lignes,SEEK_CUR);
}
fseek(file_map, 3, SEEK_CUR);
(fgets(char_num_map,3,file_map));
num_map = atoi(char_num_map);
(fgets(char_nb_lignes,3,file_map));
nb_lignes = atoi(char_nb_lignes);
fseek(file_map, 1, SEEK_CUR);
(fgets(char_nb_colonnes,3,file_map));
nb_colonnes = atoi(char_nb_colonnes);
printf("Nb map = %d, Nb colonne = %d, Nb ligne = %d\n\n",num_map,nb_colonnes,nb_lignes);
//num_map++;
}
/*for(k=0;k<15;k++)
{
printf("Le caractere detecte est : %c\n",fgetc(file_map));
printf("Le caractere detecte est : %c\n",fgetc(file_map));
printf("Le caractere detecte est : %c\n",fgetc(file_map));
printf("Le caractere detecte est : %c\n",fgetc(file_map));
printf("Le caractere detecte est : %c\n",fgetc(file_map));
printf("Le caractere detecte est : %c\n",fgetc(file_map));
printf("Le caractere detecte est : %c\n",fgetc(file_map));
printf("Le caractere detecte est : %c\n",fgetc(file_map));
printf("Le caractere detecte est : %c\n",fgetc(file_map));
}
*/
fseek(file_map, 4, SEEK_CUR);
char * TableauCarte = NULL;
TableauCarte = malloc(nb_colonnes * nb_lignes * sizeof(char));
for(i=0;i<nb_colonnes;i++)
for(i=0; i<nb_colonnes; i++)
{
for(j=0;j<=nb_lignes;j++)
for(j=0; j<=nb_lignes; j++)
{
TableauCarte[nb_lignes*i+j]=fgetc(file_map);
}
......@@ -49,3 +85,5 @@ char* LireCarte(const char *filename, int num)
fclose(file_map);
return TableauCarte;
}
......@@ -5,7 +5,6 @@
char* LireCarte(const char *filename, int num);
#ifndef CARTE_H_INCLUDED
#define CARTE_H_INCLUDED
......
......@@ -71,11 +71,12 @@ int main()
init_jeu("../resources/Init_jeu.xml");
printf("La case choisie est : %c\n",LireCarte("../resources/Maps.txt",40)[50]);
/* Pour Henri <3 */
printf("La case choisie est : %c\n",LireCarte("../resources/Maps.txt",3)[0]);
main_SDL();
//main_SDL();
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment