From fa5f2e7f00d896fe3b96748518b7e562a93f8a50 Mon Sep 17 00:00:00 2001 From: Manzovince Date: Wed, 29 May 2019 13:36:40 +0200 Subject: [PATCH] new version of fillit.h with details --- .DS_Store | Bin 8196 -> 0 bytes f_handle_errors.c | 4 ++-- fillit.h | 18 +++++++++++------- libft | 1 - main.c | 11 ++++------- 5 files changed, 17 insertions(+), 17 deletions(-) delete mode 100644 .DS_Store delete mode 120000 libft diff --git a/.DS_Store b/.DS_Store deleted file mode 100644 index 5c5092dfca15558b80701859ce4b6d88133165e3..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 8196 zcmeHMU2GIp6h7a!rL!{7X{`dv{SVRmQPncY@G zViBV;>63pk@quVGMtM<#k3jT^=##ODg3$*hCcdCPAPFYwxpSv=ciZBdfiO3@_uRSX zoO|y5`rSEur$mI#oY6+Kl86+pLTXF7S)d5LsPjrB7^z|j_9uI+tuN`MGV?6Mfe?WZ zfe?WZfe?WZf!hTE&e@_Ui{yQ&4cicb5P`cA0r7r_aTPKi$SEoPR|hx#6@XXoR=i}_QuJJ{zP+rDaTk;ml-ekCeYt2 z94pDC1f?iLHksrWMWx!w1uWcr*Qo7`^803HG-F$?*V=jok+SlNC6!9_o~7zCeb3%~ z`_%(OR?jrGy!Ox4O&4?I|>>x-EV%iYg80JMyx?s4;#F?{f;4` z7}}=_&%@E18g%_Bq3Oz++!}$yx@KMNcNrNi5g4{?RMq}tR@%^9u>^MAv{}^$?8K;P zYerPYY2T*mgL%1SZErBRy;jwS_@hvYx9A3A9i6&T=GtEo7Bx3W{cJPvh zg|5Re#DbK@_{o@$USoW%M6po{A|I8gCUS>P4^um5seU?24xOTDIz#8^JYAqK=xh3c zuF^I7gZ`wy=x-3BsKP2Vpc(720WH{yZtTEL?7|ax8b>gKairiNgX1`X=Wq(o<20u6 z3SPtOcmrqfK0d&QIE!;Qj|;enOZWztaRuMuDz4#I{D$9gGg1~&Bh`@_x!y>Sy2w8S zvwL7p*K)t~Ot|?>!1%WoW_;bwUAy)mBN@@L2-D-syrz!GrP2D<$&x987 zAJz4BEm3B^RwlJ=>L!Ibu2o3w7PURfr$8&0+DFyx3X@%1BDK2O5shjjAJ)|ML=_GH zP2pP-_$#_XztDBM$;7R|GSr|RYtf1=i2J17gT2^~gBZjx4&g9N9A)}iI0g?nOkk2J zd>Sv{MZAQUnZmF76n+zL;~l(<_n68b;bVLOx#NGEVX+;k|aZ^Iv zf;4gcMw4$p&tfiFEMifVG9vz~vt*8ZUp8$!=`pbgt`+2oM8a)JGV$XVXbV>N^D1%d zihK*w*aF(3Rr#)WdQ&Dhuu|Ordlvuxf2VIVTz`l_h`=onKzVmxcPAUn{y-_UjqpH> z>oZ(M5q48j`YzlE6EW^z$63z(!;t&2Ko<|>l$5OD^1puw5Wk+o{EsmI-`)BD9|!AN A;Q#;t diff --git a/f_handle_errors.c b/f_handle_errors.c index 74ff957..2746f4a 100644 --- a/f_handle_errors.c +++ b/f_handle_errors.c @@ -1,12 +1,12 @@ /* ************************************************************************** */ /* */ /* ::: :::::::: */ -/* handle_errors.c :+: :+: :+: */ +/* f_handle_errors.c :+: :+: :+: */ /* +:+ +:+ +:+ */ /* 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 */ /* */ /* ************************************************************************** */ diff --git a/fillit.h b/fillit.h index 17a4f8d..a73a692 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/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 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 GRN "\e[42m" //#define YEL "\e[43m" @@ -52,12 +56,12 @@ ** 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) ** test : -** letter : -** dope : -** memory : -** same : -** next : -** start : +** letter : letter of the tetrimino for printing final map +** dope : flags for details, optimisation, printing and error +** memory : positions already tested by a tetrimino in bitwise +** same : pointer to previous identical tetrimino +** next : pointer to next tetrimino +** start : pointer to first tetrimino of input file */ typedef struct s_fillist { diff --git a/libft b/libft deleted file mode 120000 index 7d1e3da..0000000 --- a/libft +++ /dev/null @@ -1 +0,0 @@ -../03_libft \ No newline at end of file diff --git a/main.c b/main.c index f03c94d..5cf1d0c 100644 --- a/main.c +++ b/main.c @@ -6,14 +6,14 @@ /* 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" /* -** 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) ** 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) @@ -67,7 +67,7 @@ int is_mdp(int ac, char **av) } /* -** main function +** Main function */ 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))); 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]))) print_error(dope[3] ? "error: Could not read file.\n" : "error\n"); check_file_errors(input, dope);