From 79a5fb188c9471deaa271a40788097416b0e8fe9 Mon Sep 17 00:00:00 2001 From: Manzovince Date: Wed, 29 May 2019 13:10:21 +0200 Subject: [PATCH] correction on fillit.h --- fillit.h | 21 ++------------------- 1 file changed, 2 insertions(+), 19 deletions(-) diff --git a/fillit.h b/fillit.h index 839e1ef..17a4f8d 100644 --- a/fillit.h +++ b/fillit.h @@ -6,7 +6,7 @@ /* By: vmanzoni +#+ +:+ +#+ */ /* +#+#+#+#+#+ +#+ */ /* Created: 2019/03/01 13:34:46 by vmanzoni #+# #+# */ -/* Updated: 2019/05/28 16:51:44 by hulamy ### ########.fr */ +/* Updated: 2019/05/29 13:09:41 by vmanzoni ### ########.fr */ /* */ /* ************************************************************************** */ @@ -139,23 +139,6 @@ char *init_print_map(t_fillist *list, int size); void print_letter_map(t_fillist *list, int size, int flag); void print_final_map(t_fillist *list, int size); -<<<<<<< HEAD -char *read_file(char *file); -void print_error(char *s); -void print_error_extended(int error); -int 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, char letter); -void fill_list(char line[], t_fillist *list); -void print_bits(unsigned int bits, int size); -void print_tetri(unsigned int bits, int size); -int search_map(t_fillist *list); -void print_map(unsigned int *tab, int width, int height, char letter); -void print_final_map(t_fillist *list, int size, int flag); -======= ->>>>>>> master -void ft_put_tetri_color(char c); +void ft_put_tetri_color(char c); #endif