merge conflict ave fillit

This commit is contained in:
Hugo LAMY
2019-05-01 14:23:53 +02:00
4 changed files with 42 additions and 286 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/30 14:24:50 by hulamy ### ########.fr */
/* Updated: 2019/05/01 14:22:58 by hulamy ### ########.fr */
/* */
/* ************************************************************************** */
@@ -47,6 +47,7 @@ int check_tetri_errors_proxy(char *tetri);
int add_to_list(char *square, t_fillist **list);
void fill_list(char line[], t_fillist *list);
void print_bits(unsigned int bits, int size); //TO DELETE BEFORE EVAL
void print_tetri(unsigned int bits, int size); //TO DELETE BEFORE EVAL
void search_map(t_fillist *list);
void print_map(unsigned int *tab, int width, int height);