From 92815d1928febf2c1bbcebc90fbbe341155003dc Mon Sep 17 00:00:00 2001 From: Hugo LAMY Date: Mon, 15 Apr 2019 17:08:06 +0200 Subject: [PATCH] resolu erreurs de tetra horizontal et vire les coordonnes en plus de tab --- a.out | Bin 9320 -> 9320 bytes a.out.dSYM/Contents/Resources/DWARF/a.out | Bin 11428 -> 11285 bytes add_to_list.c | 28 ++++++++-------------- 3 files changed, 10 insertions(+), 18 deletions(-) diff --git a/a.out b/a.out index a55f7c099e64acd38f72adb2c502a80399b241b5..7345a4879bf9b777b7460d664e7c4e1a84c8a089 100755 GIT binary patch delta 750 zcmY*XO=uHA6rOdr`GLeu1b?c9Zc0EQkfu0BZkB!?Dz(51O~@Q`C^Ayl#* z0)@Q^(jI%W5)ajbBvwoiBy(6Wg&^rgc5e|61~2P-n*{2>zMt>S`@Xj`<1mNqi?|39 zA`wE4z~d5c&ky9-+U?cN_V0UzH{OBB-MRa*zOQ6tD>D_d8o|gmGs{kk+PIzZvcq#B zbg4k4A(^x{f+9YYQ+%w;jB<}Pf6C1K4~8n$d`GQCfZ9-r;e%Xfxxhug)PaC~{E%klkB^)A?^Sk*zL<++z@OUx4weCLMwwvdZV|#;H1+ zCG|}ByL?qUiGhmQWaicoPJMvCf8UykPHQ?GFm+P80zU}Rz|?Obz;#q}QZeg!G&zfR z;H3Y0-Uqy5I5Hr37%~OOXd9;`>m>S8`cYrGT$3bG|E6|hb3!FD5m&$*-UQRQ1*Sg( z&G0hR9a#hqt(La%^z8M!Cx{_!8qDMs{enDsA;)?Wz8wr;p?d`8VvhZKcvQOtG4|`$ yT4Fw~!Q+60TpOdBb(Wa7+6j@ERMJpYp*qoD8RvTa{oJY)C}m1Z#*!6CKKlpPNcs){ delta 808 zcmZuvO=uHA6yEK|CWXXZ1;t-5CEy{@ZXi&hLUQQPxvT_b4iS5>Aw7zhKrf-fQpt1- z1ox_V^;n6}VImC-3Ue-7HfgT)~_rCXLzW2S^eIE93&AniT z1wj-9p#h#R^WEtiN%{U_XDt6oy*|p9a=A?Ue!Uh_CBqFz_h@NAiAS~m21Pv!Ih@0^ zeo`CgEs<(%ruCAVH^DB`+5m82j9b4X?+GYiiaJ;y3G#jnc-TTC&i8o-K1X`l3CY!m zfEaRh6Sy{RodWHvx60{kPwU`9*}*h4{!g7I5HSOZg63crvcbEbLlJ=yNB<~N;`pzE zAb_sH1}U@BV#om%ikx-Su4tBAjY5S((Ly%AQ9;%LvfhgF{y9kd55Vk9+GNO{(Cl^O z%GI^0>X2yz33Ll5APsN#Bn=uk$sVMYX-|arz}e) z$F+KH>6>&(Z75KhwlFP^Ff9%FXUH3OV^{Ael=R`c$8sS`x>FRPq&G!TN;-^mlB5f- zhSZSet}xO|lD<)jC2q4)pOG&7s15j3-p#*3(Bu<LEShrG-f4qGEi063K6)^J|`wem8 zOw7*{u%B`Oi@SSZ&c>XtE=|uC0CT=-&@j&aj{rT7q{1p#l-eM!HEx) diff --git a/a.out.dSYM/Contents/Resources/DWARF/a.out b/a.out.dSYM/Contents/Resources/DWARF/a.out index d7eab358bae77025696c91713106525b88c14d3d..5c9f559452d0d311929414251275152b14d21c4d 100644 GIT binary patch delta 1288 zcmYk6O=uHa6vyw!oZC#Q$(W>lRz)YaHEBYN$dmRxqvFO&>Y~Gp>LR>RR zdWNf&8wveo&^l@puTY1F@`zG@8?;~uOQk&YKcX)_YV*+-g8~h1qhd1urRh#8(h}c{gq+oMwtJnxw~Vq1}z~S4p#6xG@gc- zDnKL)YrDYCK%?4T4`e8?1p}K^7Fx0po&_}vQcZw(2)4>WV+KS7_WFbPUkp-J_DK+}jChPAjnnr|d8a45FD9_!Nowz~RO z>jwTzKWrT@E~1GY3>-j{th`hlhp>|GSOI&gLQu^?1BNda=OL=(dkk9`mg=^WrKT04StUOs zz}c-rW@mAclOWD1dA^ua@*C?Cig7-PJ77*!UcYVY;AQQ!H+MeAJsO{!nmRN!IbC2a zm@qOncBpXDXxjQczt!z;-`7#ww6p#}>$lC0KarHpSZ&A`^^^AQ;utzwUOd35U+ z6k~XX>Zju-eqQ2m$QZ50JU(;~u^4%ScR7l;Ig&?g={hFK5~Z1mdJ3vj$2|1`?;uK3 z^fijHH+pW<<@(2aRwoi}G5?H^6T?+7@$d^$5x?xfYf@2K6r+C=hlGwMJF;G5z0?>J_g0$sEPH$f zl@8EiWaQZn__lePju;rlIn(RV@Wf!{Zt^;pg^^KxBGs*LrDkkuij2!TmF{jKKT@>c NbO~QSul$ov@n3rJ-{AlN delta 1431 zcmZXTT})I*6vyY|o?&-Uc3r>s+nVAb>IuCR2e}3nj zIcMg~<@B|lsc7ioH5HBql6Gj2$?PV=?9!%lQq^px-18* z{o&;u2AxE##&Sd!NIChfaCul0l=0tewVdi5X_qYp+E_ zciRlQ>3Q9aYP3bz;leJ1qAE=sg_uS|h~{=1v}g#Ki)%EC=v=!&5f7bf)W}z2hi5#r z?4cQh(ul^L_r1nHD*h4r!Z#git05Z=!fZ$oQ&~MY*VBn&Pw4v~y)UV~_s}Y|7!Ogf z0=`KoJp*OJfpQ1@4wQ;L>(s}nb|Y(cAmKoj3&Avq3E<)wu%FR34a}9&K32L_`)|uZ zog<;9mL`g^n*ZqG)zome+k`?{z;_aan1@Qy0Zh11B6(&SxMf_&+3vInP5toX0I( zelb4<<%0i<%N8zk@uT1u@@WY0X9R1UKrscCD7NF@cfj$_LCYmw@un#VqMyUR#^4o# zzrZNfn0ti_Fad3rI4uxO2>ucQp6w=Neit_x0X8Z4m-)2dugP{M2&Kb#MW*GJdR^&v(5MT-?q9oHr+I0GwW)dOW&IZ%IP?KzJ~(O~DZzbO(@q0npS-g-6oV7=;BkHJ`C z#PshePEzdMfoyvCT@6vV{M@yW^qV&lPIKG)8~Xe=4{t z#fLSs#sxgAwNjdN0Je6VXi2*Ramh{{Ii*6Zaqq>i8U-ZHuMM=0Th^%dKrGqiLxNyd_7w3&=G%g3=+ mo*OtStKwsRRVGFx3-a4|Yn8rGRI0nw2q04QO>re2r*8p4v;J@Z diff --git a/add_to_list.c b/add_to_list.c index a67fe6b..936492b 100644 --- a/add_to_list.c +++ b/add_to_list.c @@ -6,14 +6,14 @@ /* By: hulamy +#+ +:+ +#+ */ /* +#+#+#+#+#+ +#+ */ /* Created: 2019/04/14 15:20:53 by hulamy #+# #+# */ -/* Updated: 2019/04/15 16:14:46 by hulamy ### ########.fr */ +/* Updated: 2019/04/15 17:07:34 by hulamy ### ########.fr */ /* */ /* ************************************************************************** */ #include "fillit.h" #include -char **fill_tetraminos(char **square, int x1, int y1, int x2, int y2) +char **fill_tetraminos(char **square, int *tab) { char **result; int height; @@ -22,11 +22,11 @@ char **fill_tetraminos(char **square, int x1, int y1, int x2, int y2) int j; i = 0; - height = x2 - x1 + 1; - length = y2 - y1 + 1; - if (!(result = (char**)malloc(sizeof(*result) * (height + 1)))) + height = tab[2] - tab[0] + 1; + length = tab[3] - tab[1] + 1; + if (!(result = (char**)malloc(sizeof(*result) * (height)))) return (NULL); - while (i < 4) + while (i < height) { if (!(result[i] = (char*)malloc(sizeof(**result) * (length + 1)))) return (NULL); @@ -36,7 +36,7 @@ char **fill_tetraminos(char **square, int x1, int y1, int x2, int y2) i = -1; while (++i < height && (j = -1)) while (++j < length) - result[i][j] = square[x1 + i][y1 + j]; + result[i][j] = square[tab[0] + i][tab[1] + j]; return (result); } @@ -69,21 +69,13 @@ void find_start_and_end(char **square, int **x) int fill_list(char **square, t_fillist *list) { int *tab; - int x1; - int x2; - int y1; - int y2; tab = (int*)malloc(sizeof(int) * 4); find_start_and_end(square, &tab); - x1 = tab[0]; - y1 = tab[1]; - x2 = tab[2]; - y2 = tab[3]; - list->size[0] = y2 - y1 + 1; - list->size[1] = x2 - x1 + 1; + list->size[0] = tab[3] - tab[1] + 1; + list->size[1] = tab[2] - tab[0] + 1; list->area = list->size[0] * list->size[1]; - list->tetraminos = fill_tetraminos(square, x1, y1, x2, y2); + list->tetraminos = fill_tetraminos(square, tab); return (1); }