42/42_old_fillit
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

derniere erreur de valgrind resolu mais a tester sur les mauvais tetri

Browse Source
This commit is contained in:
Hugo LAMY
2019-05-29 15:51:41 +02:00
parent c82ba9bccb
commit 819a14407d
1 changed files with 12 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
f_handle_errors.c
View File

@@ -6,7 +6,7 @@
/* By: vmanzoni <vmanzoni@student.42.fr> +#+ +:+ +#+ */ /* By: vmanzoni <vmanzoni@student.42.fr> +#+ +:+ +#+ */
/* +#+#+#+#+#+ +#+ */ /* +#+#+#+#+#+ +#+ */
/* Created: 2019/03/01 13:29:05 by vmanzoni #+# #+# */ /* Created: 2019/03/01 13:29:05 by vmanzoni #+# #+# */
/* Updated: 2019/05/28 19:35:38 by hulamy ### ########.fr */ /* Updated: 2019/05/29 15:51:12 by hulamy ### ########.fr */
/* */ /* */
/* ************************************************************************** */ /* ************************************************************************** */
@@ -35,13 +35,16 @@ void print_error_extended(int error, int *dope)
if (error == 1) if (error == 1)
print_error("error: File contains char other than '.','#' and '\\n'\n"); print_error("error: File contains char other than '.','#' and '\\n'\n");
if (error == 2) if (error == 2)
print_error("error: File contains more than 2 '\\n' in a row\n"); print_error("error: File contains two tetriminos not"
"separated by a '\\n'\n");
if (error == 3) if (error == 3)
print_error("error: File contains more than 2 '\\n' in a row\n");
if (error == 4)
print_error("error: File contains less than 1 tetrimino " print_error("error: File contains less than 1 tetrimino "
"or more than 26\n"); "or more than 26\n");
if (error == 4)
print_error("error: Tetrimino has more or less than 4 #\n");
if (error == 5) if (error == 5)
print_error("error: Tetrimino has more or less than 4 #\n");
if (error == 6)
print_error("error: Tetrimino # are not all connected\n"); print_error("error: Tetrimino # are not all connected\n");
print_error("error\n"); print_error("error\n");
} }
@@ -66,16 +69,15 @@ void check_file_errors(char *file, int *dope)
print_error_extended(1, dope); print_error_extended(1, dope);
else if (file[i] == '\n') else if (file[i] == '\n')
line_nbr++; line_nbr++;
// le if suivant verifie quoi
if (file[i] == '\n' && line_nbr % 5 == 0 && file[i-1] != '\n') if (file[i] == '\n' && line_nbr % 5 == 0 && file[i-1] != '\n')
print_error("error\n"); print_error_extended(2, dope);
if (file[i] == '\n' && file[i+1] != '\0' && \ if (file[i] == '\n' && file[i+1] != '\0' && \
file[i+2] != '.' && file[i+2] != '#') file[i+2] != '.' && file[i+2] != '#')
print_error_extended(2, dope); print_error_extended(3, dope);
i++; i++;
} }
if (line_nbr < 4 || line_nbr > 129) if (line_nbr < 4 || line_nbr > 129)
print_error_extended(3, dope); print_error_extended(4, dope);
} }
/* /*
@@ -102,7 +104,7 @@ int check_tetri_errors(char *tetri)
i++; i++;
} }
if (htg != 4 || dot != 12 || check_tetri_errors_proxy(tetri)) if (htg != 4 || dot != 12 || check_tetri_errors_proxy(tetri))
return (4 + check_tetri_errors_proxy(tetri)); return (5 + check_tetri_errors_proxy(tetri));
return (0); return (0);
} }
@@ -127,13 +129,7 @@ int check_tetri_errors_proxy(char *tetri)
j++; j++;
if (i > 4 && tetri[i] == '#' && tetri[i - 5] == '#') if (i > 4 && tetri[i] == '#' && tetri[i - 5] == '#')
j++; j++;
if (tetri[i] == '.' || tetri[i] == '\n')
i++; i++;
else if (tetri[i] == '#' && (tetri[i + 1] == '#' || tetri[i - 1] == '#'
|| tetri[i + 5] == '#' || tetri[i - 5] == '#'))
i++;
else
return (1);
} }
return ((j < 6) ? 1 : 0); return ((j < 6) ? 1 : 0);
} }