ajout de test_big_tetri.c et merge conflict

This commit is contained in:
Hugo LAMY
2019-04-25 13:06:34 +02:00
5 changed files with 39 additions and 43 deletions

View File

@@ -6,7 +6,7 @@
/* By: vmanzoni <vmanzoni@student.42.fr> +#+ +:+ +#+ */
/* +#+#+#+#+#+ +#+ */
/* Created: 2019/03/01 13:34:46 by vmanzoni #+# #+# */
/* Updated: 2019/04/24 13:46:32 by hulamy ### ########.fr */
/* Updated: 2019/04/25 13:04:13 by hulamy ### ########.fr */
/* */
/* ************************************************************************** */
@@ -39,10 +39,12 @@ typedef struct s_fillist
char *read_file(char *file);
void print_error(char *s);
void parse_input(char *input);
void parse_input(char *input, t_fillist *list);
int check_file_errors(char *file);
int check_tetri_errors(char *tetri);
int check_tetri_errors_proxy(char *tetri);
int add_to_list(char *square, t_fillist **list);
int fill_list(char *line, t_fillist *list);
void print_bits(short line); //TO DELETE BEFORE EVAL
#endif