new version of fillit.h with details

This commit is contained in:
Manzovince
2019-05-29 13:36:40 +02:00
parent 246906a490
commit fa5f2e7f00
5 changed files with 17 additions and 17 deletions

BIN
.DS_Store vendored

Binary file not shown.

View File

@@ -1,12 +1,12 @@
/* ************************************************************************** */ /* ************************************************************************** */
/* */ /* */
/* ::: :::::::: */ /* ::: :::::::: */
/* handle_errors.c :+: :+: :+: */ /* f_handle_errors.c :+: :+: :+: */
/* +:+ +:+ +:+ */ /* +:+ +:+ +:+ */
/* 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/28 19:35:38 by hulamy ### ########.fr */ /* Updated: 2019/05/29 13:23:02 by vmanzoni ### ########.fr */
/* */ /* */
/* ************************************************************************** */ /* ************************************************************************** */

View File

@@ -6,7 +6,7 @@
/* By: vmanzoni <vmanzoni@student.42.fr> +#+ +:+ +#+ */ /* By: vmanzoni <vmanzoni@student.42.fr> +#+ +:+ +#+ */
/* +#+#+#+#+#+ +#+ */ /* +#+#+#+#+#+ +#+ */
/* Created: 2019/03/01 13:34:46 by vmanzoni #+# #+# */ /* Created: 2019/03/01 13:34:46 by vmanzoni #+# #+# */
/* Updated: 2019/05/29 13:09:41 by vmanzoni ### ########.fr */ /* Updated: 2019/05/29 13:31:37 by vmanzoni ### ########.fr */
/* */ /* */
/* ************************************************************************** */ /* ************************************************************************** */
@@ -34,6 +34,10 @@
#define CYN "\x1B[36m" #define CYN "\x1B[36m"
#define RESET "\x1B[0m" #define RESET "\x1B[0m"
/*
** Color for full block tetriminos when printing colored map
** (don't forget to comment all #define COLOR above)
*/
//#define RED "\e[41m" //#define RED "\e[41m"
//#define GRN "\e[42m" //#define GRN "\e[42m"
//#define YEL "\e[43m" //#define YEL "\e[43m"
@@ -52,12 +56,12 @@
** rank : position de 1 a 32 dans l'int du tableau d'int (position % 32) ** rank : position de 1 a 32 dans l'int du tableau d'int (position % 32)
** num : memorise dans quel int du tableau on se trouve (position / 32) ** num : memorise dans quel int du tableau on se trouve (position / 32)
** test : ** test :
** letter : ** letter : letter of the tetrimino for printing final map
** dope : ** dope : flags for details, optimisation, printing and error
** memory : ** memory : positions already tested by a tetrimino in bitwise
** same : ** same : pointer to previous identical tetrimino
** next : ** next : pointer to next tetrimino
** start : ** start : pointer to first tetrimino of input file
*/ */
typedef struct s_fillist typedef struct s_fillist
{ {

1
libft
View File

@@ -1 +0,0 @@
../03_libft

11
main.c
View File

@@ -6,14 +6,14 @@
/* By: vmanzoni <vmanzoni@student.42.fr> +#+ +:+ +#+ */ /* By: vmanzoni <vmanzoni@student.42.fr> +#+ +:+ +#+ */
/* +#+#+#+#+#+ +#+ */ /* +#+#+#+#+#+ +#+ */
/* Created: 2019/02/12 13:20:48 by vmanzoni #+# #+# */ /* Created: 2019/02/12 13:20:48 by vmanzoni #+# #+# */
/* Updated: 2019/05/29 13:12:03 by vmanzoni ### ########.fr */ /* Updated: 2019/05/29 13:27:14 by vmanzoni ### ########.fr */
/* */ /* */
/* ************************************************************************** */ /* ************************************************************************** */
#include "fillit.h" #include "fillit.h"
/* /*
** function that put the flags for bonus into a tab of int ** Function that put the flags for bonus into a tab of int
** **
** d : debug print (print the map during the backtracking) ** d : debug print (print the map during the backtracking)
** o : optimisation ultra fast but with some errors still ** o : optimisation ultra fast but with some errors still
@@ -45,7 +45,7 @@ int *create_dope(char *av, int mdp)
} }
/* /*
** function that check if the password is good to unlock the flags ** Function that check if the password is good to unlock the flags
*/ */
int is_mdp(int ac, char **av) int is_mdp(int ac, char **av)
@@ -67,7 +67,7 @@ int is_mdp(int ac, char **av)
} }
/* /*
** main function ** Main function
*/ */
int main(int ac, char **av) int main(int ac, char **av)
@@ -82,9 +82,6 @@ int main(int ac, char **av)
dope = create_dope(av[3], (mdp = is_mdp(ac, av))); dope = create_dope(av[3], (mdp = is_mdp(ac, av)));
if (ac == 2 || mdp) if (ac == 2 || mdp)
{ {
// ft_putnbrendl(size);
// print_final_map(list, size, 1); // DEBUG
// print_final_map(list, size, 0); // DEBUG
if (!(input = read_file(av[1]))) if (!(input = read_file(av[1])))
print_error(dope[3] ? "error: Could not read file.\n" : "error\n"); print_error(dope[3] ? "error: Could not read file.\n" : "error\n");
check_file_errors(input, dope); check_file_errors(input, dope);