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

New handle_errors and cleaner print_map_with_colors

Browse Source
This commit is contained in:
Manzovince
2019-05-08 08:10:09 +02:00
parent d057ef941b
commit fe191054c9
2 changed files with 30 additions and 51 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
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/03 19:11:02 by vmanzoni ### ########.fr */ /* Updated: 2019/05/08 08:09:14 by vmanzoni ### ########.fr */
/* */ /* */
/* ************************************************************************** */ /* ************************************************************************** */
@@ -31,15 +31,16 @@ void print_error(char *s)
void print_error_extended(int error) void print_error_extended(int error)
{ {
if (error == 1) if (error == 1)
ft_putstr("error: File contains char other than . # \\n found.\n"); ft_putstr("error: File contains char other than '.','#' and '\\n'.\n");
if (error == 2) if (error == 2)
ft_putstr("error: File contains more than 2 \\n in a row.\n"); ft_putstr("error: File contains more than 2 \\n in a row.\n");
if (error == 3) if (error == 3)
ft_putstr("error: File contains less than 1 tetrimino or more than 26.\n"); ft_putstr("error: File contains less than 1 tetrimino"
"or more than 26.\n");
if (error == 4) if (error == 4)
ft_putstr("\n\nerror: This tetrimino has more or less than 4 #.\n"); ft_putstr("\n\nerror: This tetrimino has more or less than 4 #.\n");
if (error == 5) if (error == 5)
ft_putstr("\n\nerror: This tetrimino # are not well connected.\n"); ft_putstr("\n\nerror: This tetrimino # are not all connected.\n");
exit(1); exit(1);
} }

72
print_map_with_colors.c
View File

@@ -6,7 +6,7 @@
/* By: vmanzoni <vmanzoni@student.42.fr> +#+ +:+ +#+ */ /* By: vmanzoni <vmanzoni@student.42.fr> +#+ +:+ +#+ */
/* +#+#+#+#+#+ +#+ */ /* +#+#+#+#+#+ +#+ */
/* Created: 2019/05/03 20:27:22 by vmanzoni #+# #+# */ /* Created: 2019/05/03 20:27:22 by vmanzoni #+# #+# */
/* Updated: 2019/05/04 19:15:35 by vmanzoni ### ########.fr */ /* Updated: 2019/05/08 08:04:05 by vmanzoni ### ########.fr */
/* */ /* */
/* ************************************************************************** */ /* ************************************************************************** */
@@ -17,62 +17,40 @@ void ft_putchar(char c)
write(1, &c, 1); write(1, &c, 1);
} }
void ft_putchar_red(char c) void ft_putchar_color(char c, char color)
{ {
write(1, RED, 5); if (color == 'R')
ft_putchar(c); write(1, RED, 5);
write(1, RESET, 5); else if (color == 'B')
} write(1, BLU, 5);
else if (color == 'G')
void ft_putchar_blue(char c) write(1, GRN, 5);
{ else if (color == 'Y')
write(1, BLU, 5); write(1, YEL, 5);
ft_putchar(c); else if (color == 'M')
write(1, RESET, 5); write(1, MAG, 5);
} else if (color == 'C')
write(1, CYN, 5);
void ft_putchar_green(char c) else if (color == 'W')
{ write(1, RESET, 5);
write(1, GRN, 5);
ft_putchar(c);
write(1, RESET, 5);
}
void ft_putchar_yellow(char c)
{
write(1, YEL, 5);
ft_putchar(c);
write(1, RESET, 5);
}
void ft_putchar_magenta(char c)
{
write(1, MAG, 5);
ft_putchar(c);
write(1, RESET, 5);
}
void ft_putchar_cyan(char c)
{
write(1, CYN, 5);
ft_putchar(c); ft_putchar(c);
write(1, RESET, 5); write(1, RESET, 5);
} }
void ft_put_tetri_color(char c) void ft_put_tetri_color(char c)
{ {
if (c == 'A' || c == 'G' || c == 'M' || c == 'S') if (c == 'A' || c == 'G' || c == 'M' || c == 'S' || c == 'Y')
ft_putchar_red(c); ft_putchar_color(c, 'R');
else if (c == 'B' || c == 'H' || c == 'N' || c == 'T' || c == 'Y') else if (c == 'B' || c == 'H' || c == 'N' || c == 'T' || c == 'Z')
ft_putchar_blue(c); ft_putchar_color(c, 'B');
else if (c == 'C' || c == 'I' || c == 'O' || c == 'U' || c == 'Z') else if (c == 'C' || c == 'I' || c == 'O' || c == 'U')
ft_putchar_green(c); ft_putchar_color(c, 'G');
else if (c == 'D' || c == 'J' || c == 'P' || c == 'V') else if (c == 'D' || c == 'J' || c == 'P' || c == 'V')
ft_putchar_yellow(c); ft_putchar_color(c, 'Y');
else if (c == 'E' || c == 'K' || c == 'Q' || c == 'W') else if (c == 'E' || c == 'K' || c == 'Q' || c == 'W')
ft_putchar_magenta(c); ft_putchar_color(c, 'M');
else if (c == 'F' || c == 'L' || c == 'R' || c == 'X') else if (c == 'F' || c == 'L' || c == 'R' || c == 'X')
ft_putchar_cyan(c); ft_putchar_color(c, 'C');
else else
ft_putchar(c); ft_putchar(c);
} }