From cfa772677cfb6c0276f4d6279a427cce9f07ddbc Mon Sep 17 00:00:00 2001 From: Manzovince Date: Thu, 18 Apr 2019 16:10:35 +0200 Subject: [PATCH 1/2] tetri_to_bit not working but better ! --- parse_input.c | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/parse_input.c b/parse_input.c index b52d673..4278eac 100644 --- a/parse_input.c +++ b/parse_input.c @@ -6,7 +6,7 @@ /* By: vmanzoni +#+ +:+ +#+ */ /* +#+#+#+#+#+ +#+ */ /* Created: 2019/04/15 14:48:14 by vmanzoni #+# #+# */ -/* Updated: 2019/04/18 13:07:56 by vmanzoni ### ########.fr */ +/* Updated: 2019/04/18 16:09:24 by vmanzoni ### ########.fr */ /* */ /* ************************************************************************** */ @@ -67,10 +67,7 @@ short create_tetribit(char *tetri) if (tetri[i] != '\n') // Pour comparer avec le tetri en char printf("%c", tetri[i]); if (tetri[i] == '#') - { tetribit = tetribit | 1; - tetribit <<= 1; - } else tetribit <<= 1; i++; From 1422c8e046226de54852c8bb4f4664423dbb54ba Mon Sep 17 00:00:00 2001 From: Manzovince Date: Fri, 19 Apr 2019 21:26:02 +0200 Subject: [PATCH 2/2] bug resolved --- parse_input.c | 3 --- 1 file changed, 3 deletions(-) diff --git a/parse_input.c b/parse_input.c index 2e6352f..9dbda39 100644 --- a/parse_input.c +++ b/parse_input.c @@ -6,11 +6,8 @@ /* By: vmanzoni +#+ +:+ +#+ */ /* +#+#+#+#+#+ +#+ */ /* Created: 2019/04/15 14:48:14 by vmanzoni #+# #+# */ -<<<<<<< HEAD /* Updated: 2019/04/18 16:09:24 by vmanzoni ### ########.fr */ -======= /* Updated: 2019/04/19 12:53:40 by hulamy ### ########.fr */ ->>>>>>> master /* */ /* ************************************************************************** */