From f7790d10882abbd3aa3d8811c7ef17893f88ae96 Mon Sep 17 00:00:00 2001 From: Manzovince Date: Fri, 12 Apr 2019 22:28:01 +0200 Subject: [PATCH] New files --- srcs/handle_errors.c | 46 +++----------------------------------------- srcs/main.c | 2 +- srcs/print_fillit.c | 19 ++---------------- 3 files changed, 6 insertions(+), 61 deletions(-) diff --git a/srcs/handle_errors.c b/srcs/handle_errors.c index 0a15002..75513e0 100644 --- a/srcs/handle_errors.c +++ b/srcs/handle_errors.c @@ -6,7 +6,7 @@ /* By: vmanzoni +#+ +:+ +#+ */ /* +#+#+#+#+#+ +#+ */ /* Created: 2019/03/01 13:29:05 by vmanzoni #+# #+# */ -/* Updated: 2019/03/01 13:39:00 by vmanzoni ### ########.fr */ +/* Updated: 2019/04/12 22:27:28 by vmanzoni ### ########.fr */ /* */ /* ************************************************************************** */ @@ -15,47 +15,7 @@ void ft_display_error(char *s, int fd) write(fd, s, strlen(s)); } -static bool ft_tetri_errors(char tetri[16]) +int ft_tetri_erros(/*args*/) { - short i; - short links_nb; - short tetri_blocks; - bool all_blocks_connected; - - i = 0; - tetri_blocks = 0; - while (i < 16) - { - if (tetri[i] == '#') - { - links_nb = 0; // reset links_nb to 0 - links_nb += (i % 4 != 0 && (tetri[i - 1] == '#')); // if not first column - links_nb += (i % 4 != 3 && (tetri[i + 1] == '#')); // if not last column - links_nb += (i / 4 != 0 && (tetri[i - 4] == '#')); // if not first row - links_nb += (i / 4 != 3 && (tetri[i + 4] == '#')); // if not last row - if (links_nb == 0) - return false; - if (links_nb > 1) - all_blocks_connected = true; - ++tetri_blocks; - } - ++i; - } - return (tetri_blocks == 4 && all_blocks_connected); -} - -bool ft_check_tetri(short tetri_nb, char tetri[tetri_nb][16]) -{ - short count; - - count = 0; - while (count < tetri_nb) - { - if (ft_tetri_errors(tetri[count++]) == false) - { - ft_display_error("Tetriminos is invalid.\n", 2); - return false; - } - } - return true; + } diff --git a/srcs/main.c b/srcs/main.c index 2c5bec2..01f0579 100644 --- a/srcs/main.c +++ b/srcs/main.c @@ -6,7 +6,7 @@ /* By: vmanzoni +#+ +:+ +#+ */ /* +#+#+#+#+#+ +#+ */ /* Created: 2019/02/12 13:20:48 by vmanzoni #+# #+# */ -/* Updated: 2019/04/12 22:00:34 by vmanzoni ### ########.fr */ +/* Updated: 2019/04/12 22:27:42 by vmanzoni ### ########.fr */ /* */ /* ************************************************************************** */ diff --git a/srcs/print_fillit.c b/srcs/print_fillit.c index 0cb5140..acf4a58 100644 --- a/srcs/print_fillit.c +++ b/srcs/print_fillit.c @@ -6,26 +6,11 @@ /* By: vmanzoni +#+ +:+ +#+ */ /* +#+#+#+#+#+ +#+ */ /* Created: 2019/03/01 13:35:48 by vmanzoni #+# #+# */ -/* Updated: 2019/03/01 13:37:45 by vmanzoni ### ########.fr */ +/* Updated: 2019/04/12 22:26:27 by vmanzoni ### ########.fr */ /* */ /* ************************************************************************** */ -void ft_print_fillit(short tetri_nb, char tetri[tetri_nb][16]) +void ft_print_fillit(/*args*/) { - short count; - short i; - count = 0; - while (count < tetri_nb) - { - i = 0; - while (i < 16) - { - write(1, &tetri[count][i], 1); - if (i++ % 4 == 3) - write(1, "\n", 1); - } - write(1, "\n", 1); - ++count; - } }