From 1afe8754c8addeaa8372837104678ee8d759b51b Mon Sep 17 00:00:00 2001 From: Adam Joly Date: Sat, 13 Jan 2024 19:04:22 +0100 Subject: [PATCH] started to clean exit --- Makefile | 8 +++- ft_move_character.c | 102 +++++++++++++++++++++++++++++++++++++++----- ft_move_character.o | Bin 6528 -> 11952 bytes get_map.c | 3 +- get_map.o | Bin 4112 -> 4136 bytes main.c | 36 ++++++---------- main.o | Bin 6184 -> 6496 bytes map.ber | 4 +- print_map.c | 10 ++++- print_map.o | Bin 5320 -> 5424 bytes printf | 1 + so_long | Bin 27288 -> 33864 bytes so_long.h | 11 ++--- 13 files changed, 131 insertions(+), 44 deletions(-) create mode 160000 printf diff --git a/Makefile b/Makefile index 93412fa..6f6867e 100644 --- a/Makefile +++ b/Makefile @@ -6,7 +6,7 @@ # By: adjoly +#+ +:+ +#+ # # +#+#+#+#+#+ +#+ # # Created: 2023/11/01 11:03:22 by adjoly #+# #+# # -# Updated: 2024/01/13 16:14:46 by adjoly ### ########.fr # +# Updated: 2024/01/13 17:23:48 by adjoly ### ########.fr # # # # **************************************************************************** # @@ -27,13 +27,15 @@ HEADERS = so_long.h LIB = MacroLibX/libmlx.so \ libft/libft.a \ - get_next_line/get_next_line.a + get_next_line/get_next_line.a \ + printf/libftprintf.a MLX_FLAGS = -lSDL2 $(NAME): $(OBJS) make -C libft make -C get_next_line + make -C printf $(CC) $(FLAGS) $(MLX_FLAGS) $(OBJS) $(LIB) -o $(NAME) %.o: %.c @@ -44,11 +46,13 @@ all: $(NAME) clean: make -C libft clean make -C get_next_line clean + make -C printf rm -f $(OBJS) fclean: clean make -C libft fclean make -C get_next_line fclean + make -C printf rm -f $(NAME) re: fclean all diff --git a/ft_move_character.c b/ft_move_character.c index acd4750..ba7ac45 100644 --- a/ft_move_character.c +++ b/ft_move_character.c @@ -6,55 +6,136 @@ /* By: adjoly +#+ +:+ +#+ */ /* +#+#+#+#+#+ +#+ */ /* Created: 2024/01/07 19:13:01 by adjoly #+# #+# */ -/* Updated: 2024/01/13 17:13:08 by adjoly ### ########.fr */ +/* Updated: 2024/01/13 18:14:25 by adjoly ### ########.fr */ /* */ /* ************************************************************************** */ #include "MacroLibX/includes/mlx.h" #include "libft/libft.h" +#include "printf/ft_printf.h" #include "so_long.h" void ft_move_up(t_window *win) { - if (win->map[win->p_coords->y - 1][win->p_coords->x] != '1') + if (win->map[win->p_coords->y - 1][win->p_coords->x] == 'C') { - ft_putimg(win->p_coords->x, win->p_coords->y - 1, win, P_PNG); + ft_putimg(win->p_coords->x, win->p_coords->y - 1, win, P_PNG); + ft_putimg(win->p_coords->x, win->p_coords->y, win, G_PNG); + win->map[win->p_coords->y - 1][win->p_coords->x] = '0'; + win->p_coords->y = win->p_coords->y - 1; + ft_printf("%d\n", win->c_count); + win->c_count--; + ft_printf("%d\n", win->c_count); + win->mov_count++; + } + else if (win->p_coords->y == win->e_coords->y && win->e_coords->x == win->p_coords->x && win->map[win->p_coords->y - 1][win->p_coords->x] != '1') + { + ft_putimg(win->p_coords->x, win->p_coords->y - 1, win, P_PNG); + ft_putimg(win->p_coords->x, win->p_coords->y, win, E_PNG); + win->p_coords->y = win->p_coords->y - 1; + win->mov_count++; + } + else if (win->map[win->p_coords->y - 1][win->p_coords->x] == 'E' && win->c_count == 0) + exit(0); + else if (win->map[win->p_coords->y - 1][win->p_coords->x] != '1') + { + ft_putimg(win->p_coords->x, win->p_coords->y - 1, win, P_PNG); ft_putimg(win->p_coords->x, win->p_coords->y, win, G_PNG); win->p_coords->y = win->p_coords->y - 1; - ft_putstr_fd("UP", 1); + win->mov_count++; } } void ft_move_down(t_window *win) { - if (win->map[win->p_coords->y + 1][win->p_coords->x] != '1') + if (win->map[win->p_coords->y + 1][win->p_coords->x] == 'C') + { + ft_putimg(win->p_coords->x, win->p_coords->y + 1, win, P_PNG); + ft_putimg(win->p_coords->x, win->p_coords->y, win, G_PNG); + win->map[win->p_coords->y + 1][win->p_coords->x] = '0'; + win->p_coords->y = win->p_coords->y + 1; + ft_printf("%d\n", win->c_count); + win->c_count--; + ft_printf("%d\n", win->c_count); + win->mov_count++; + } + else if (win->p_coords->x == win->e_coords->x && win->p_coords->y == win->e_coords->y && win->map[win->p_coords->y + 1][win->p_coords->x] != '1') + { + ft_putimg(win->p_coords->x, win->p_coords->y + 1, win, P_PNG); + ft_putimg(win->p_coords->x, win->p_coords->y, win, E_PNG); + win->p_coords->y = win->p_coords->y + 1; + win->mov_count++; + } + else if (win->map[win->p_coords->y + 1][win->p_coords->x] == 'E' && win->c_count == 0) + exit(0); + else if (win->map[win->p_coords->y + 1][win->p_coords->x] != '1') { ft_putimg(win->p_coords->x, win->p_coords->y + 1, win, P_PNG); ft_putimg(win->p_coords->x, win->p_coords->y, win, G_PNG); win->p_coords->y = win->p_coords->y + 1; - ft_putstr_fd("UP", 1); + win->mov_count++; } } void ft_move_left(t_window *win) { - if (win->map[win->p_coords->y][win->p_coords->x - 1] != '1') + if (win->map[win->p_coords->y][win->p_coords->x - 1] == 'C') + { + ft_putimg(win->p_coords->x - 1, win->p_coords->y, win, P_PNG); + ft_putimg(win->p_coords->x, win->p_coords->y, win, G_PNG); + win->map[win->p_coords->y][win->p_coords->x - 1] = '0'; + win->p_coords->x = win->p_coords->x - 1; + ft_printf("%d\n", win->c_count); + win->c_count--; + ft_printf("%d\n", win->c_count); + win->mov_count++; + } + else if (win->p_coords->x == win->e_coords->x && win->e_coords->y == win->p_coords->y && win->map[win->p_coords->y][win->p_coords->x - 1] != '1') + { + ft_putimg(win->p_coords->x - 1, win->p_coords->y, win, P_PNG); + ft_putimg(win->p_coords->x, win->p_coords->y, win, E_PNG); + win->p_coords->x = win->p_coords->x - 1; + win->mov_count++; + } + if (win->map[win->p_coords->y][win->p_coords->x - 1] == 'E' && win->c_count == 0) + exit(0); + else if (win->map[win->p_coords->y][win->p_coords->x - 1] != '1') { ft_putimg(win->p_coords->x - 1, win->p_coords->y, win, P_PNG); ft_putimg(win->p_coords->x, win->p_coords->y, win, G_PNG); win->p_coords->x = win->p_coords->x - 1; - ft_putstr_fd("UP", 1); + win->mov_count++; } } void ft_move_right(t_window *win) { - if (win->map[win->p_coords->y][win->p_coords->x + 1] != '1') + if (win->map[win->p_coords->y][win->p_coords->x + 1] == 'C') + { + ft_putimg(win->p_coords->x + 1, win->p_coords->y, win, P_PNG); + ft_putimg(win->p_coords->x, win->p_coords->y, win, G_PNG); + win->map[win->p_coords->y][win->p_coords->x + 1] = '0'; + win->p_coords->x = win->p_coords->x + 1; + ft_printf("%d\n", win->c_count); + win->c_count--; + ft_printf("%d\n", win->c_count); + win->mov_count++; + } + else if (win->p_coords->x == win->e_coords->x && win->p_coords->y == win->e_coords->y && win->map[win->p_coords->y][win->p_coords->x + 1] != '1') + { + ft_putimg(win->p_coords->x + 1, win->p_coords->y, win, P_PNG); + ft_putimg(win->p_coords->x, win->p_coords->y, win, E_PNG); + win->p_coords->x = win->p_coords->x + 1; + win->mov_count++; + } + else if (win->map[win->p_coords->y][win->p_coords->x + 1] == 'E' && win->c_count == 0) + exit(0); + else if (win->map[win->p_coords->y][win->p_coords->x + 1] != '1') { ft_putimg(win->p_coords->x + 1, win->p_coords->y, win, P_PNG); ft_putimg(win->p_coords->x, win->p_coords->y, win, G_PNG); win->p_coords->x = win->p_coords->x + 1; - ft_putstr_fd("UP", 1); + win->mov_count++; } (void)win; } @@ -78,5 +159,6 @@ int ft_key_event(int key, void *param) // RIGHT/D else if (key == 7) ft_move_right(win); + ft_printf("Mouvement : %d\n", win->mov_count); return (0); } diff --git a/ft_move_character.o b/ft_move_character.o index bd1b736650aa5030edb6c34a6eb1e9ab2ff120b9..4b5f77b375a356d7a08ead54a039b0d49bd259da 100644 GIT binary patch literal 11952 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 literal 6528 zcmcgweQaA-6~E8V_r-}5J0D$_t!4FSyL26SjFF^>I`cynya zA6YUrbXwX;ku`185Cg=Z0wIJnv7!kvK#Z1Fuz@xWjlTeaCT)-k{@9QvWuj9#=e~37 zm%Ah_P&m@_J?D3S_uO;Nz3=1t=%KrA4;Y4EF~pc?TZ{^ky27U`H6{9hIpHk7;Vk{V z*I8a%b()9ZN)0;Ak3u^hYmNt(&KXYbMW-2jfk7wN8GSw&T3Ss+k39^IXi&__9bmPY z3NEd{xHp~V#H#aSo_GZn=J@DNt`gjY*>qGCUTm>tC+Pf~JwA__dTy7__8vYH-Eq-; zPXCAboVu*}KoplDA15~sg=;TOv(sCy*7_Xt6}&0bn!v)UMTYg-wCexH`h;*+PA9b4 z>f9zaU7vOGQOmVaKDZ|TlYD&3bBX!HmKV=E%MIA^hu(CS53MXMp1(eNyxXh)iqkxx zb}67&M~_Doy11gCbN7G+_*Na?@8LlmAN25!=<&`qe!vjtT0e;@gFnm*3 zh~R)>M#5pwkUheTj1Qo30Q#&bOy02zu(5C$?2rvk`>oWVH+bl(o39e0Q;Glq=)6nk zj1M3yyl)Llya=~>5K|K&^=QMgzE}QiLeO!*&4biw*lN@PW4A=)Nw|z5(bo5b+WPgq zO8*LS_6{ojd#K+KQ~GPDe_&5rA081_;3+@@--4eGxP)Z{z7LJb4?JV1nm%OgP{V!? zea5xk^h$q!&>JU%fxqCmx8MgQU@LbWp^#?_@e(M;C($zdIs=c-d)i)X*5hn%akj7J z{00V)pP?3KXhY6ui!-V?T{t1iH{l{bW0(r?jv#KbRq-sWcsTI*jIvV7hnSdbltxzt-5~KErofuAhxS@J)6jSxgY;u`SSgu&I$+HsI=mS{!+^*x>NO* zQ7uf*DC<6VA>+ZxGGbuxA zBGdYaG(uxiJaLH;^gsk_X0X$8B#E=_2e+3q0toinhvaqOJ}pOW%-*X3N3b1gV9OpT zLsITZV=?xtOfRhlw!a2(uLjR(HTXYAaI+N8$Sqxel@?6gW!;~8L-UXiq``n*y-NhTle=hK!f6~3+r{7xUJU_lirGY zm+8G^bXb_}x5b)1Q}nE{(YP9}ewa4}Z&eg^FGE{}3-MPF1X0frXvg3}`~)Sbo*jUV z5MH4a7{|96@>$r=qX6_W=xcws0sgBE@EncBa3}?Z6bZ*yGk!;$zu?IugfqXN>@QQR z^M9!EcaeR@$H%I&{~M_;?4M{NNx1I+u*Tw(K*XNHuzJI;m)%YBbMak&#?ETmfkDVo8z0IM?|L z8qRflP{X+nCp4V%;{A_d`R5IH_k=pTBErtQla1+2c5<@n&I!Bf7PEHUo!3qxcCI{& z2ddUbbnCRDPGjmIL!N5&YKsL2AJ3yVNue}VZuO~?kX0mq@r{}JB{b( z75C{}eBSFAa$l$MFKL~cDYC#_FaKAtFd(O>ewaVjSkM1Xz|iLiTz>fhEeJm!xsT`P z7VER#_?J7p5f`f;-nZ!JzYExU^M~mE;dyX=+|v5|Uj@v(>p~ft2jOZ- hjK*^raXgAX|GR+spO=aRKPNF+kQo|)4f@jO{}*Xr%sK!7 diff --git a/get_map.c b/get_map.c index 6406928..4e34d42 100644 --- a/get_map.c +++ b/get_map.c @@ -6,7 +6,7 @@ /* By: adjoly +#+ +:+ +#+ */ /* +#+#+#+#+#+ +#+ */ /* Created: 2024/01/08 13:13:18 by adjoly #+# #+# */ -/* Updated: 2024/01/13 15:27:42 by adjoly ### ########.fr */ +/* Updated: 2024/01/13 19:02:19 by adjoly ### ########.fr */ /* */ /* ************************************************************************** */ @@ -56,6 +56,7 @@ char **ft_read_map(char *file_name) break ; i++; } + map_read[i] = NULL; close(fd); return (map_read); } diff --git a/get_map.o b/get_map.o index fb4c41749dc05d2778fbdbf93c7d14e4de2a39c8..e57de24f11046de7589f9145610009bb620533c8 100644 GIT binary patch delta 211 zcmbQButH&i2BXGC&1^;ik8alw9^JkVJdU%RU;u*2Qy7;rmQA)|%4IyZc?HuGM$uy+ zVMjiJHYR6YHl~9->>LaXD>g4=>0{)HXXR$|V&(H<b%7 delta 180 zcmWm7tqQ_W90l-uu5+6(cL!n=Y--SI97FN*1!l5Y#B6oND8hLF1wXKk!LTkGeFK9J z;@=Z~>2S`Yd2Alr2-40PyyAuxXL^G?d+IOhxspVFu-AjCty9l&l{#gqbwH`?E;+Zm z+}dwxPaOlq*}`pE=rQrevh(u#*b&tbcSd53i5RmGM}!}u!AKl35hpCf4`IT}+4}z~ Sb>Y +#+ +:+ +#+ */ /* +#+#+#+#+#+ +#+ */ /* Created: 2024/01/06 16:18:56 by adjoly #+# #+# */ -/* Updated: 2024/01/13 17:02:27 by adjoly ### ########.fr */ +/* Updated: 2024/01/13 19:01:34 by adjoly ### ########.fr */ /* */ /* ************************************************************************** */ +#include "libft/libft.h" #include "so_long.h" void ft_freemap(char **map) @@ -25,13 +26,6 @@ void ft_freemap(char **map) free(map); } -int key_close(int key, void *param) -{ - if (key == 41) - mlx_loop_end(param); - return (0); -} - int win_close(int event, void *param) { if (event == 0) @@ -39,16 +33,16 @@ int win_close(int event, void *param) return (0); } -/*int win_update(void *param) +void ft_exit(t_window *win) { - t_window *win; - int y; - int x; - - win = (t_window *)param; - ft_move_character(key, void *param) - return (0); -}*/ + mlx_destroy_image(win->mlx, win->img); + mlx_destroy_window(win->mlx, win->win); + mlx_destroy_display(win->mlx); + ft_freemap(win->map); + free(win->p_coords); + free(win->e_coords); + free(win); +} int main(int ac, char **av) { @@ -62,7 +56,7 @@ int main(int ac, char **av) win->mlx = mlx_init(); win->win = mlx_new_window(win->mlx, 1600, 900, "so_fluffy"); win->map = map; - + win->mov_count = 0; mlx_on_event(win->mlx, win->win, MLX_WINDOW_EVENT, win_close, win->mlx); mlx_on_event(win->mlx, win->win, MLX_KEYDOWN, ft_key_event, win); // mlx_loop_hook(win->mlx, win_update, win); @@ -71,11 +65,9 @@ int main(int ac, char **av) mlx_destroy_image(win->mlx, win->img); mlx_destroy_window(win->mlx, win->win); mlx_destroy_display(win->mlx); - ft_freemap(map); - free(win->c_count); - // free(win->p_coords->y); - // free(win->p_coords->x); + ft_freemap(win->map); free(win->p_coords); + free(win->e_coords); free(win); return (0); } diff --git a/main.o b/main.o index 41b83867f8fd0d686fb44e6a51a99c117d8a2be8..15d301445b06c870c21e6fae6839ff4f311642e0 100644 GIT binary patch literal 6496 zcmb_gZERat89vw7*Ky*+c0QUWYiT^%(XbJ_=_Zjv+Id>d9Ot8hHET=PIXCuo;?BO; z_#;iq3Z>~Lq6pUVi$9e8;Kzi zUu638n}oomb)b4ubf*?uGHRLKDW+7&$L1p_`J(~hOd!VXy7p0QV%a=b;NB- zVK)O7SI7J^Ch3cPvJsJuK{A?DO!Y=?B-U{NFe_L#lmNd)O1F}D=k+9Xx{+2Aw_g$J z4}o|)x#H)|>c|h`KE|$I)M2!*Vl)(TB4!e(lkd1*$v)oRh>swTLby$dN1Rw?R}Jh^ zf?-ZRCD4@o6JQSiydh^1GSqI<1aK!=r&RTMmV?SXN#C4jATQSE8IAfpyZQJkM^0U@ zIO$xWmdhx&whv1U?yHOdn)=aA$}y?;cPN1p zQSj>W#ryOilJ@pL*w2{HU>*X-x*2PEV2kNjUB;}+K+wiAPsM85{%YKxbTVeX>F~a z1tVY~2SktYNsa6GbfAd^>wDRzKIq@nKN{vbhS%@ygOx?`MtSiqel|T@v#Yg8reNB0kp-(< z$vbvrcz<+Xba-g^K#lj_&x&T=j%HZQ&Q)UbPSL8w%;f8SfY+|OYS+AOe7{a@z~fD(9(&= z6H`Z7uA0u3Evsmj*qOYY&J>)A#V`?cSc~~8FBC2%mYFxpEYGY3D2|oPvROnARxB*C zd~uGI(iz7oXDe)xEwPF)szR}Zk^u!Kh~dy8TZUH2pS9AE&{-f#B@GF(&KXt}ikV?1 z+@k;A6uS$>4AowuV z`z_wheV;%a1RtAvzvpvx|ECcL!AGXvub~0 z8|`hk3?JBG-yE<~&RzUMnL}-;RL(S9vF|puTh+@H^Ep2bsYSYJ&d_a2)Rpv?%;t1?~OZazCmqps&NW93|BR|AK_$J5%sqlyDrk zz^_Sor-bADqu}=t_fmrYYXm_M$L+qr|A-(6;&PquarFK8dJ{Z`3kia8@VhPI0Vx!_`MSUEs5VI@&C|-zb4_h z;}m(tqmK2%zO|0`&?^9OdA$ZDTwbpSBwSvvha_BHuPF(a*Xv{xJlh0^-8~na1FTgD zt{n>E^?fPmxJD=f|A=ccoLdycMNG8s!V8Gt54k4WMJ-M%mBtbAya@i2#5+K(z)zF? zpn~&VIA93{zd-i5f`66lPb>I0$Ud&%f|n*-t-q-7Un2XAg8!22XB7N5WM8IM#GfJi zo79SVc$Mt$DEQlCzoy`~$i6|Xh<}OfUnzXS6Y)gezYtHfB93_9|4WJUQ?gr-2qNM< zLH0HUPm{e{!9~7d1sC%v-ZLWpbvGTGQuuEYF7gQeW5mlT{1n-?g5!H1<*b5>I-gZ= z@jm^Uf{XgEDEL3!@a)?P-b=Q4?}_>c2>+47kCXkTf_ISpwt{=f{*!{^W)|f=1^18* zn^-QQo&$sj6nrn?5tq*20rGnwuHZ9dix#=~6Zh?T&`|^~?nBX!>E!sWE!%s-ouT$% z*S6laKsWBx)3Cj-mYt<^HeV?f%%v?Doq>>MTW7>cD4MlqYjbIHcD8ISuxQyTn9-`W z$j@z0Sxag6n1)V{O-3~16!B!ad9;JxybWhO3I;Xs%mv3OA*ob`gCHLLq(dU8Wy{Q_ z5q7h>h2-s=)|6df!q+$R7 delta 2080 zcmZ{lU1%It6oBuY$$nZ?>c{hzp%tbnO0!OL#)4X5Qdm{bqs2m`lQiPsXGqf?Cl6*_ zDznB)*2|B|sx8Y>)>vMo)t0AqVG+4li%cuEsI1arEwbSOQKR)dW?}oi!a7VoRzZ58 z!t6%F?7@cs1`nGvfehQ#X18+tIV39euAYbgHj6riA_j=}o(Z z9?($Vm)+6#H#74Nt@ax}Nc38YI0vlu)$HsCOa>K0uVn0Ua`dIEFykhKw4~;hX z#drr^2&SG8yM|rRJ7%3R`wi`ArJ*0^(O`((=I}}IJ#N9%p(Y-Nk&u&$hSvjz@m#<* z&IfdyHRD`>>DDT&h1zt>I00F6GOnQ`h>j=)koqFrG!O7+p=e&^`(Zrn@@sHCe2~w> z3hEz==kIVo;-gL?Ir-q4+-pQHaNJD4vGSN;kbnZY6n>9&a~{ zSGxH=kJs^dUzeOF6Ni$^kBEQY!^0S?dico06CS=;;(5`u?Qz`pBvg6$j~;G$c+tb@ z22czC;o(6K-zwwydR0QjLLqjQ^Hs>$F3j2?=&(C@5$5bu{8w19-8^j`3H`hPj&(9n z{wqz43gefseLNy^B^AFSNfcJUoyU>#Piz=|1BLyeF>|QpYri9CGYj|pCljm z@iWq%F5`InoRna;%)!`}EcCXIt47t~P;cU)j8}(4arFZ}_tnwKrrYlepF^GPuYFv- znY%u&Uj4d{+tR-0<56ipz`2c@R-MMA!=erM@TVkqe7q4di5_!F#4`N+GnQ+Gg4J#$ z7Ed~6IAK>=@L6I48mlMG?K>1cs9xqLA(wQ`Df+HahF~t)j{k}#48&m*jnj}xyL>ksNjLltzrb`) diff --git a/map.ber b/map.ber index 242be01..2954fea 100644 --- a/map.ber +++ b/map.ber @@ -1,5 +1,5 @@ 1111111111111 -10010000000C1 +100100C0000C1 1000011111001 -1P0011E000001 +1P0011E00C001 1111111111111 diff --git a/print_map.c b/print_map.c index 609dbc5..61fbeac 100644 --- a/print_map.c +++ b/print_map.c @@ -6,12 +6,13 @@ /* By: adjoly +#+ +:+ +#+ */ /* +#+#+#+#+#+ +#+ */ /* Created: 2024/01/09 15:30:06 by adjoly #+# #+# */ -/* Updated: 2024/01/13 17:14:56 by adjoly ### ########.fr */ +/* Updated: 2024/01/13 17:56:32 by adjoly ### ########.fr */ /* */ /* ************************************************************************** */ #include "MacroLibX/includes/mlx.h" #include "libft/libft.h" +#include "printf/ft_printf.h" #include "so_long.h" #include #include @@ -35,7 +36,7 @@ void ft_printmap(char **map, t_window *win) int y; y = 0; - win->c_count = malloc(1 * sizeof(size_t)); + // win->c_count = malloc(1 * sizeof(size_t)); win->c_count = 0; while (map[y]) { @@ -52,7 +53,12 @@ void ft_printmap(char **map, t_window *win) win->c_count++; } else if (map[y][x] == 'E') + { + win->e_coords = malloc(sizeof(t_coords *)); + win->e_coords->x = x; + win->e_coords->y = y; ft_putimg(x, y, win, E_PNG); + } else if (map[y][x] == 'P') { win->p_coords = malloc(sizeof(t_coords *)); diff --git a/print_map.o b/print_map.o index 0c074089c78a5916c2839f98a4e7e67f3b6d706d..5536727a6b9ec49563d68244ee2ba743e428de28 100644 GIT binary patch delta 1174 zcmZ8fT}YEr7(Va$cD{Yv)crV}L!r%|+U&S4CH47uKRc%RtG0L!>^txCynoMo4jT^-RwhF* z+ZUcJ(G$(H`tzm;;l}ZTexPMa?`{|;&YrJW2LU<)7^Fpb8p>$90UvN!ZNM1_J0g1b z80c|5GW`w%v}FBuKIw_Zk107bJ|-pNdMME{BVnQ`6xR}5Mo0^yTd;}Vc82~gE+(3% zxo-a{CO{4un`} z-)_kY2MyLLnNP5cQkZKBrF!my%TmD;yl7b}D2DTK$K-%AbDSYuK8Pchimod07^F$5 zunB)$bgv>A9MUp4?2=e2R2E6xCF)lPGI&i$VtL`Ukqll}N9&`MPTfPJnaT+psV82fEM{59q+gcDmW*+v|* z`}`-fvMw{-A+z_gvZZGBk;qohnOO^uI{5cz(J*;s&X*MVKS5dz?r`}0d&Glq%kH|0 z7acyhCTdcHjw0}XHtNWE)7!ac{F}#gjt_p}&z#qg##gyMc!Sfqcj}*+b#3NaOZ6|z z__?fjzZs9?P@d17%*x)yxjY}v=4t+$S(#q5Zz$zLMs)9$G4xB2G781~fKNRH8*#3P2fQo)0rjflZ2$lO delta 1090 zcmZ`%T}V@57(VYgJAa$|pPmgboQid3KWrCa!f44FZbeXC)PjEP!Y&pFQ7Ix88{t}o zR zD29Gq_@rp9Doh>D^(P_?^`v@F2l~~=S6fD!^ zSbZ2($nYE=K>)8pBg6?s0SrD5p(;I@om5!)cc{S!RL(Z`GtN^p^3@Ctmf+eE)85$oE;Zkz0{sogMHCk=1mi&qR* zJ#4bH!D<+*baGHn)~S_JaHmzUgG@WEf~+`|%NPY3%H_<)jl;NTY3e_!FzvX|q_TXI zy?v0YU|p%;kjubEhi1Ql?=t_Ppn+dAd|0pGBVo=evxVdgJtS6N0=b*8n572`0rR4x zj?E?1n_UguU@`5YMW(C6aY@HT@dfrs9k?W&s%EQmZ4TFCK5mx;m9LT&?mM>1ec;6p z@^!oWp2$nnqVqJRGw4_P@RCxCi^{QJ{I?{;l&B~OnL*Ja)TBjT=o}P5s7><{NB@L1 zmmibr5IAsIT@QRShNLT`Y@@TWWkx&xv}%EKQW8lmA!su^dCQ|z6m7w2pmPijdR3`Y)FcAbbIPB?DfL{ro1tJ tRKkc_gF{{&#&E_P107XgOjTslzJTX_Es(~%F9uyW!|<$ diff --git a/printf b/printf new file mode 160000 index 0000000..71ce8f7 --- /dev/null +++ b/printf @@ -0,0 +1 @@ +Subproject commit 71ce8f741dae4b145a4d5cb2bf74de651c859100 diff --git a/so_long b/so_long index b255364791f70ef563bf6f18dd58165168896b61..7a08e255e109743e4efe789d5b9a2371d2b5a11a 100755 GIT binary patch literal 33864 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 delta 7448 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 Tz}2ov*6v1?eN2F>+j9OND-uVI diff --git a/so_long.h b/so_long.h index ece6883..e8c9da5 100644 --- a/so_long.h +++ b/so_long.h @@ -6,7 +6,7 @@ /* By: adjoly +#+ +:+ +#+ */ /* +#+#+#+#+#+ +#+ */ /* Created: 2024/01/06 16:19:42 by adjoly #+# #+# */ -/* Updated: 2024/01/13 17:13:56 by adjoly ### ########.fr */ +/* Updated: 2024/01/13 19:00:01 by adjoly ### ########.fr */ /* */ /* ************************************************************************** */ @@ -16,12 +16,12 @@ # include "MacroLibX/includes/mlx.h" # include "libft/libft.h" # include "get_next_line/get_next_line.h" +# include "printf/ft_printf.h" # include # include # include # include -# define T_SIZE 64 # define P_PNG "assets/player.png" # define G_PNG "assets/ground.png" # define E_PNG "assets/exit.png" @@ -32,7 +32,7 @@ typedef struct s_coords { int x; int y; -} t_coords; +} t_coords; typedef struct s_window { @@ -41,8 +41,9 @@ typedef struct s_window void *img; char **map; t_coords *p_coords; - size_t *c_count; - size_t *mov_count; + t_coords *e_coords; + size_t c_count; + size_t mov_count; } t_window; int ft_key_event(int key, void *param);