From 904013801a2c842424967214fdafbb1c13727db0 Mon Sep 17 00:00:00 2001
From: Adam Joly <adjoly@2E2.42angouleme.fr>
Date: Wed, 10 Jan 2024 15:14:24 +0100
Subject: [PATCH] started movement

---
 Makefile                            |   3 ++-
 ft_move_character.c                 |  30 +++++++++++++++++++---------
 ft_move_character.o                 | Bin 0 -> 4792 bytes
 get_next_line/Makefile              |   2 +-
 get_next_line/get_next_line.a       | Bin 0 -> 4970 bytes
 get_next_line/get_next_line.h       |   4 ++--
 get_next_line/get_next_line.o       | Bin 0 -> 2536 bytes
 get_next_line/get_next_line_utils.c |   6 +++---
 get_next_line/get_next_line_utils.o | Bin 0 -> 2056 bytes
 main.c                              |   6 +++---
 main.o                              | Bin 5040 -> 5288 bytes
 print_map.c                         |  17 ++++++++++------
 print_map.o                         | Bin 4888 -> 5120 bytes
 so_long                             | Bin 21016 -> 26432 bytes
 so_long.h                           |  10 +++++++---
 15 files changed, 50 insertions(+), 28 deletions(-)
 create mode 100644 ft_move_character.o
 create mode 100644 get_next_line/get_next_line.a
 create mode 100644 get_next_line/get_next_line.o
 create mode 100644 get_next_line/get_next_line_utils.o

diff --git a/Makefile b/Makefile
index 3d6637b..75df256 100644
--- a/Makefile
+++ b/Makefile
@@ -6,7 +6,7 @@
 #    By: adjoly <adjoly@student.42.fr>              +#+  +:+       +#+         #
 #                                                 +#+#+#+#+#+   +#+            #
 #    Created: 2023/11/01 11:03:22 by adjoly            #+#    #+#              #
-#    Updated: 2024/01/09 15:54:39 by adjoly           ###   ########.fr        #
+#    Updated: 2024/01/10 15:08:43 by adjoly           ###   ########.fr        #
 #                                                                              #
 # **************************************************************************** #
 
@@ -16,6 +16,7 @@ CC = cc
 
 SRCS = main.c \
 		get_map.c \
+		ft_move_character.c \
 		print_map.c
 
 OBJS = $(SRCS:.c=.o)
diff --git a/ft_move_character.c b/ft_move_character.c
index 3cc42cc..0688330 100644
--- a/ft_move_character.c
+++ b/ft_move_character.c
@@ -6,30 +6,42 @@
 /*   By: adjoly <adjoly@student.42.fr>              +#+  +:+       +#+        */
 /*                                                +#+#+#+#+#+   +#+           */
 /*   Created: 2024/01/07 19:13:01 by adjoly            #+#    #+#             */
-/*   Updated: 2024/01/08 13:24:49 by adjoly           ###   ########.fr       */
+/*   Updated: 2024/01/10 15:10:58 by adjoly           ###   ########.fr       */
 /*                                                                            */
 /* ************************************************************************** */
 
 #include "so_long.h"
 
-int	ft_move_up(void *param)
+void	ft_move_up(void *param)
 {
-	
+	t_window	*win;
+
+	win = (t_window *)param;
+	ft_putimg(*win->player_x, *win->player_y - 1, win, "assets/player.png");
 }
 
-int	ft_move_down(void *param)
+void	ft_move_down(void *param)
 {
-	
+	t_window	*win;
+
+	win = (t_window *)param;
+	ft_putimg(*win->player_x, *win->player_y + 1, win, "assets/player.png");
 }
 
-int	ft_move_left(void *param)
+void	ft_move_left(void *param)
 {
-	
+	t_window	*win;
+
+	win = (t_window *)param;
+	ft_putimg(*win->player_x - 1, *win->player_y, win, "assets/player.png");
 }
 
-int	ft_move_right(void *param)
+void	ft_move_right(void *param)
 {
-	
+	t_window	*win;
+
+	win = (t_window *)param;
+	ft_putimg(*win->player_x + 1, *win->player_y, win, "assets/player.png");
 }
 
 int	ft_move_character(int key, void *param)
diff --git a/ft_move_character.o b/ft_move_character.o
new file mode 100644
index 0000000000000000000000000000000000000000..e1fa11354d1567249bb4bbe5f39876613fc79dbf
GIT binary patch
literal 4792
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

literal 0
HcmV?d00001

diff --git a/get_next_line/Makefile b/get_next_line/Makefile
index b6d6d89..267ea62 100644
--- a/get_next_line/Makefile
+++ b/get_next_line/Makefile
@@ -6,7 +6,7 @@
 #    By: adjoly <adjoly@student.42.fr>              +#+  +:+       +#+         #
 #                                                 +#+#+#+#+#+   +#+            #
 #    Created: 2023/11/01 11:03:22 by adjoly            #+#    #+#              #
-#    Updated: 2024/01/08 14:31:46 by adjoly           ###   ########.fr        #
+#    Updated: 2024/01/10 14:58:45 by adjoly           ###   ########.fr        #
 #                                                                              #
 # **************************************************************************** #
 
diff --git a/get_next_line/get_next_line.a b/get_next_line/get_next_line.a
new file mode 100644
index 0000000000000000000000000000000000000000..cd220916e69da91cdc22662d4114838ab7789913
GIT binary patch
literal 4970
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

literal 0
HcmV?d00001

diff --git a/get_next_line/get_next_line.h b/get_next_line/get_next_line.h
index 4b29599..c3220c2 100644
--- a/get_next_line/get_next_line.h
+++ b/get_next_line/get_next_line.h
@@ -6,7 +6,7 @@
 /*   By: adjoly <adjoly@student.42.fr>              +#+  +:+       +#+        */
 /*                                                +#+#+#+#+#+   +#+           */
 /*   Created: 2023/12/01 17:12:00 by adjoly            #+#    #+#             */
-/*   Updated: 2024/01/08 21:47:06 by adjoly           ###   ########.fr       */
+/*   Updated: 2024/01/10 15:03:00 by adjoly           ###   ########.fr       */
 /*                                                                            */
 /* ************************************************************************** */
 
@@ -22,7 +22,7 @@
 
 char	*get_next_line(int fd);
 char	*ft_strjoin_gnl(char *s1, char *s2);
-size_t	ft_strlen_gnl(char *s);
+size_t	ft_strl_g(char *s);
 void	*ft_calloc_gnl(size_t nmemb, size_t size);
 
 #endif
\ No newline at end of file
diff --git a/get_next_line/get_next_line.o b/get_next_line/get_next_line.o
new file mode 100644
index 0000000000000000000000000000000000000000..f93ff55ce998e1c542d64ab342bf620036a17e99
GIT binary patch
literal 2536
zcmbtV-)kII6h5=NO}0tei4w7B#eFH3N~VnpS_l%6(J3^2C<KZcrklxZ8aq2%W@k$j
z1|yS5H={97`shnvS|3Xv3Vqn7R2uZje?Yp(7Is0f!eUnt)^qOMJGq&5pFA*g&;8DK
zzI*Pu^W!W1^hX&*0bvTf54$sg0vsLQ^=Ftn1Ea{CGwP3xdho=k*V;RJiy}LElLjNw
zpBUC`OKpthr?$g?;EMi8U3+OyB$p3+BkHwn3~lI-ZYt{fK8$w`;w{o!;kHuOTb<ke
zet%aiPFZ(liioaG=RsYYl$O|-$YZdLbu_O`<P*(EZ!+;_=YA~C7!PxKR&_MndULjE
zSU(f+Q12_997>`CYD4eOKPYMH>uZPrl(yLZ!#@h52dtFny*5Reze66mZM6Ym59>R?
z=SE%cbzWeTpdBad=snKv8R1Wb`3H%9J?Mr(7u0Vl`|F_F&jP5MOo}IU{wAq#`Uok2
zy8bfW@6k~<hVT~a*K;h|AlRrs<skMaNn5)~p(tn@(L0PQae_9=?pZQ?9(g*w$9ZH$
zL02f=r85??O(P7Niu&DQrc`Si_t0S`7`@JGI5(oWbR(K=(y??-(ZM~_FMzp)n(NmJ
zmQ!?>3YTrKx?FJ!Q*UV}w5iFdlQkB78(@O3qI`K4l$CMi)v@9H7Pf`zpo^?aw+{}E
zf0Oy}z)<E-WW=#)!qH5+CGk&^_-BNp9j7*nc=njW2rTmK?FK?Q_^Y3eSO_Q>5r!os
zmW52>%T89}3!F~sMTyV$hS(2yjSG@AzB>Sa1#zZBdqZPA!0{+v&(o<PPW<zn&w7H`
z^#S}toJTvR=k{MbX0lTQ@T(jjMec5w0DhGC^yv~hw+8UpE5S8n{x1XgzYV~Dm)6}c
ztvkYxDqW|_ajKo(3sL9s0sNB^pR@%3EXQeixeuR8e0p{S-x;7^Kn@v&@e`BS4EGY8
z@AG^L7w5b$KQz35Gy|GvJ4Ma6SA5W{O1W&i=qyyLQ1VUBE-sq3=T$tKRekUC%Cc)N
zxeiUOqT^I7Hq+dSZ)+c)nVYQoMe8DHj&r$e78e)s<z9j%+c#a*H=SkI))s1|y$Dzr
zZ0jNm@?z`@X2~m-Z76xR4OGP549x-!i}8yKIDS#4@&DT$l#u%=6is@_(c<4k?9-jM
zHvx!77^f%r4EMh0=P3f|cQO532;LTdSXTLhBN!kl@trxuiS*wlEWL+c`MQG7=}Eqr
zkD)_LoDcvXMgAKpoR^dILC3hjWa`t@zC|p}y&C6VO4EBBSP_YQOz&qCarwOx^l^S5
z1_!8r^!*U|qJMLUWl#4jIIQB8*g2k0Ib@Vimad<Ei|N{lcZnZJfhW*F-;wnC{{bl<
Bqi6sC

literal 0
HcmV?d00001

diff --git a/get_next_line/get_next_line_utils.c b/get_next_line/get_next_line_utils.c
index fbc774e..8092e51 100644
--- a/get_next_line/get_next_line_utils.c
+++ b/get_next_line/get_next_line_utils.c
@@ -6,13 +6,13 @@
 /*   By: adjoly <adjoly@student.42.fr>              +#+  +:+       +#+        */
 /*                                                +#+#+#+#+#+   +#+           */
 /*   Created: 2023/12/01 17:12:02 by adjoly            #+#    #+#             */
-/*   Updated: 2024/01/08 21:48:30 by adjoly           ###   ########.fr       */
+/*   Updated: 2024/01/10 15:03:07 by adjoly           ###   ########.fr       */
 /*                                                                            */
 /* ************************************************************************** */
 
 #include "get_next_line.h"
 
-size_t	ft_strlen_gnl(char *s)
+size_t	ft_strl_g(char *s)
 {
 	size_t	i;
 
@@ -32,7 +32,7 @@ char	*ft_strjoin_gnl(char *s1, char *s2)
 	j = 0;
 	if (!s2)
 		return (NULL);
-	result = ft_calloc_gnl((ft_strlen_gnl(s1) + ft_strlen_gnl(s2) + 1), sizeof(char));
+	result = ft_calloc_gnl((ft_strl_g(s1) + ft_strl_g(s2) + 1), sizeof(char));
 	if (result == NULL)
 		return (NULL);
 	while (s1[i])
diff --git a/get_next_line/get_next_line_utils.o b/get_next_line/get_next_line_utils.o
new file mode 100644
index 0000000000000000000000000000000000000000..c8c717976de3a240b68b64229f17e1c059c68ab3
GIT binary patch
literal 2056
zcmbtUKWGzC7=M?<Bx-A_RuKPS20<Kpq;)D3IhE)QtrVe)Sk7yDiK&-MNiL-dhlSJ9
zGzb+(2OV^-i-QPSsF*H7HnRv>gakUATR<Ux-@Esk>m{B1;NADW-}nEQ*FH&3-V6u=
z;UbW$q-$}MkhMeIyF{-NIRcS0a`~5Bw%T$v=^!jul5M#%<*ZCZN$lxy7ja~JOOVS+
zr}eYb=|G4xyB)i*g7Gxp-j$$+BbQ4}s8dHAbd74;YLeKqK^JNx)Y?U(VmVE;pzID9
zP1mScJF-xf?W*t@x8M;C*|r+~GVdUuMN7ayFmv6V`4Sdo$og;;t_^gq(QBP;Qg2mZ
z6Q13KfSQ|q#m%P3!P!u>#wyiXpC~7M9oFt!D2h`wU_Iayj{Q}d-A->Xz7jor*_H!@
zAI0`AWhdeK#Y;lF^??r;+e|tip>0PV--)g6BliW1vD+l}{ETZj)YuocKs{Ddj&1VE
z%P?&pnk9(jMAd;POqp`9v3=exPx)mFcM1MZY1zj>Vs@L%%#{qY6i?}@k%=#9g<>{u
z#7D=(gg81fI$ok)_z{MoG>Y)}4iT1zgtG&Y=mxNH4lq0@<M_FDY-lxbV=!z&0GQ~T
zKpaFw_P9TIS-=SN-$N&g*B|)f7H~a1-x44p^1IXH03b*LJ#ZF~p&pcwi-4Vg_(klE
z!t^P)A}%2YLT3j(4F_>9bZ0OOIQ{BdEHDH*4CgPt5|H%+@Yfz3b9nqDn+vg^2Y>6q
zBOW}=M#Ok89tRr*-Q6t+kq`voxI`^N?laAC&QmxPj1aM)>8faI%O(+1`CLvjOp-R0
zqFGqTXALD|=xC-?UC*beB^r5C6K~y~87Z1->LC$zeJQ7?^YifRGAvbBGOV!nKuH(W
zoJP_GO(Qv4hGaBTF`%QOXAMm$nOVIkrichVO?3|Rqa5o0mI_orp8c|mgo3<s)!vss
z9}eJejTmaLNX%G7LOtStJDAH_d7|KrF>r&She2a0{98jg?J6<=8fzq&&DDF>7ym1J
zh0o9R7&!Ue8~4LEH~0Bt6*u3%CaJUhWuC}1pP$2b;nHvaHw=_nAnuPG^L)Plb-;p?
kojj-&ID67$`Mfsfqxk2430S{Xr`e;}!XyyPL&)F%AAqoi*Z=?k

literal 0
HcmV?d00001

diff --git a/main.c b/main.c
index 1d5ca65..d9f1264 100644
--- a/main.c
+++ b/main.c
@@ -6,12 +6,11 @@
 /*   By: adjoly <adjoly@student.42.fr>              +#+  +:+       +#+        */
 /*                                                +#+#+#+#+#+   +#+           */
 /*   Created: 2024/01/06 16:18:56 by adjoly            #+#    #+#             */
-/*   Updated: 2024/01/09 16:13:17 by adjoly           ###   ########.fr       */
+/*   Updated: 2024/01/10 15:08:11 by adjoly           ###   ########.fr       */
 /*                                                                            */
 /* ************************************************************************** */
 
 #include "MacroLibX/includes/mlx.h"
-#include "libft/libft.h"
 #include "so_long.h"
 
 int	key_close(int key, void *param)
@@ -35,6 +34,7 @@ int	win_close(int event, void *param)
 	int			x;
 
 	win = (t_window *)param;
+	ft_move_character(key, void *param)
 	return (0);
 }*/
 
@@ -51,7 +51,7 @@ int	main(int ac, char **av)
 
 	mlx_on_event(win->mlx, win->win, MLX_KEYDOWN, key_close, win->mlx);
 	mlx_on_event(win->mlx, win->win, MLX_WINDOW_EVENT, win_close, win->mlx);
-	// mlx_on_event(win->mlx, win->win, MLX_KEYDOWN, ft_move_character, win->mlx);
+	mlx_on_event(win->mlx, win->win, MLX_KEYDOWN, ft_move_character, win);
 	// mlx_loop_hook(win->mlx, win_update, win);
 	ft_printmap(map, win);
 	mlx_loop(win->mlx);
diff --git a/main.o b/main.o
index 97b3f656e9845f81329b69bc6f568373b6829708..bf37fa19d817a94f59873e17eb3264b3e765ba7b 100644
GIT binary patch
delta 1063
zcmZ8gO=uHA6rQ)qZg%stJNezDwB2g4NlT&4L8?$&wQ5Neq2fUc(xfFNg3`1EY4MMG
z5L<spd=^h0yj8GZ?ZuNIUhG9^y?C?U6czkERFpWgyCrKMyYt@r=6i46%)EJ$Tx_qT
zgd(kW+=f*3*)sM+Kst8w@Q3vJ$|;Be+`<WA7d*lR;b;?W1VSXCdWkR*w!D(%;a?%q
zssG2=@+^kl%A$$L*<3Ps&{fLr@NqlkYVdQ-8LmcBx0~d;-Aqk;o^y<N-EL_i3R@Q6
zxqb#q=kha!sgY@78#B1>?sN0hsELJWhF5SvrPqalfaE#^eveE}<D57O6hDhypkbpl
zn$RS9pBRy{Vxm`U&WZzBQOJs_BuDU?G|uZCU}@asTMgHw2)aFGta#$E7poo}i*g(m
z@P$W*hkR^*&*&i{u+fqZTR&%-<2l>UAjk$zd*Zl9?q-M1Gj!stJP4m~Rc?haevx%H
zib@v*aktWij}?F5wH?iO=)=p3o-mKaMmHU^QCw2=t1%nl%DfGxd2E#Ze`=QW@iSt=
zm10`fFlgi3`6nH?mr=L!<Q#a&!X<NsGN!$H`i5hgI>PQbaMgi7Sjl_u3lPIi|6oJF
zCLOUgUzazQ8*n&qJTbKm{?4YjT)}ie$HhQS^@n3}Fyf0U-jGIBjH(yuczNXf#D&7h
zSTR49A1fDD?x+Sp7MC?$sqspfoW(V*pFM^k?NN&M;k?2jYQQi~QXM|x9PNi6xJr}o
z6ql*4+_kU1!Xgb=!ZgFW&7LPDheN?0WvAJmgfw84dA;`gNMe;`eaUkOV<Ky`7;aFS
z@Ufk-uT*a+tFR(wLP=3#Q*N9U!a_yG`A{4DHfz|hbDlA4_{D1w-m2&gx4|1shjrzv
Xy*&+w!UmkcNrvtBSea8;4IBReFelV(

delta 910
zcmY+CJxmlq6vt<FZ}(>IZkOG=!`(&BJ422Wqv5c@LIOl$AbtcZTOfp3$t6-~wD2Pu
ziC*OLFEp{Sq_B|CU|}MKg%wiTNo+7N5fciHMtn1S2j@T8eeeI~H*Y?6m-}8<mW~;<
zj>hpi4;yPMt95R1J`WgW{s3=`^98?~GiDo&+l*wiTrGAuYDOo*|A>~0iLi%eGfUA*
zWz3nilSk4j56vi}q9V-0>>%$J2YJCmDY1)QYY11Z+0L@+HtKp0jkAtzmUt#9*ci5~
z8SZ1u?&mHR?3sjXi(!1X=fnWv3HD<TqscrLk_%WCA-0ntzmEYC@TdB{foTy$uc&dB
z8ElH8l3s}-*Nh1+0=yGdgd*f!+LdILf5K(i6J?3}vlr`<noLU2lSN(ja}RH2Kc2`8
ze#%UgqI!$nQ6NbjDvd%az&Dw3x|AiU(20wwU?@*nYfiN}s`|^e`kA)6-&UUlPX~M!
zo2ekGwJ}Z`b8|IHKQrLD0&C8Q{7pkj=P>OC2;Ffkxl>L$+bO(UDldJv!@*zo*6QPq
z0vE)crnV+saZVm`^+a|BAG~4uf22PsKP!av920&q8Yfom;*_o(yx!xkKg>6<?pLgr
zROY(hH6tdjQ@^71f=oi!Z>U=&RWXqrlv`%(1QyACRX0PbV9_sHE0pP8^ci@r68%!1
zv0AgS0<}Dh<|@`M<$48U*}=VBueD8ucq@;Z|M0lp%9nj`$AOXW?OUgUd0}s!!X0|{
bC7L(V49vr(7g!^-1w)_YqaC9j7W2h_{^zya

diff --git a/print_map.c b/print_map.c
index 083864c..612eb4b 100644
--- a/print_map.c
+++ b/print_map.c
@@ -6,13 +6,14 @@
 /*   By: adjoly <adjoly@student.42.fr>              +#+  +:+       +#+        */
 /*                                                +#+#+#+#+#+   +#+           */
 /*   Created: 2024/01/09 15:30:06 by adjoly            #+#    #+#             */
-/*   Updated: 2024/01/10 10:40:19 by adjoly           ###   ########.fr       */
+/*   Updated: 2024/01/10 14:57:51 by adjoly           ###   ########.fr       */
 /*                                                                            */
 /* ************************************************************************** */
 
 #include "MacroLibX/includes/mlx.h"
 #include "libft/libft.h"
 #include "so_long.h"
+#include <stddef.h>
 
 void	ft_putimg(int x, int y, t_window *win, char *file_path)
 {
@@ -21,20 +22,25 @@ void	ft_putimg(int x, int y, t_window *win, char *file_path)
 
 	img_x = 0;
 	img_y = 0;
+	if (file_path[7] == 'p')
+	{
+		win->player_y = ft_calloc(sizeof(int), 1);
+		win->player_y = &y;
+		win->player_x = ft_calloc(sizeof(int), 1);
+		win->player_x = &x;
+	}
 	ft_putstr_fd(file_path, 1);
 	ft_putchar_fd('\n', 1);
 	win->img = mlx_png_file_to_image(win->mlx, file_path, &img_x, &img_y);
 	mlx_put_image_to_window(win->mlx, win->win, win->img, x * img_x, y * img_y);
 }
 
-int	ft_printmap(char **map, void *param)
+void	ft_printmap(char **map, t_window *win)
 {
 	size_t		x;
 	size_t		y;
-	t_window	*win;
 
 	y = 0;
-	win = (t_window *)param;
 	while (map[y])
 	{
 		x = 0;
@@ -48,11 +54,10 @@ int	ft_printmap(char **map, void *param)
 				ft_putimg(x, y, win, "assets/obj.png");
 			else if (map[y][x] == 'E')
 				ft_putimg(x, y, win, "assets/exit.png");
-			else if (map[y][x] == 'P')
+			else if (map[y][x] == 'P')	
 				ft_putimg(x, y, win, "assets/player.png");
 			x++;
 		}
 		y++;
 	}
-	return (0);
 }
diff --git a/print_map.o b/print_map.o
index 5586358617be50ca3afd8709bc0b21c10757d6da..2061b43be1fca3dd8a239216c820e2d66b3bf0fd 100644
GIT binary patch
literal 5120
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
NPZ|Xkp7Z4T9|Os~{xSdn

delta 1914
zcmZ`)U1(fY5I*PJJ$Lu+&HmodO=`MHO0;XhO*S^9wsG^LYd2L$UQ*I(O;=OX#r!Ny
zLQ=7AB_KqLb{#3jpOSzmMYI(k#5{<_LiItZ#D`dXFi_D4(fA++RCMOvvvv1E2kx2q
zzL_&~X3pKarxWMzI-3yd!BT5?>GNlrhO<jQW*2{H&n}(X$}Y`qX0K&_U?|y_GMm|@
z%sPzl9AAf3-izyB_S!ATK4q_;ij1E6EW3EM9lTn;GsFfg#<XpywBTNIpUIfV;#$x&
z9Uuct3l3NW_MlG>VI?mVwAy~3WTMX5Ln(~iRnVX05gyfhRm86P0jsB;F|!5JrA-r4
zu|sfEyR$eW7!z#>wY|8I@VJLm9j}+9$MNBJu>b7_tX$@IgqiLoL~;%vevm8?@rly2
zj@7{#L$pwZ3Jz*zMcaAYf%jpkAxdL5vS=fsqc*A~#QbEFtRYgR;#CFW8T4Q|r$C$z
zk2#$DO$RD7HruE}ltw6_*x5>o=E9^$q%qRAbuQ>s+AuC8TGE6E<&hne6ANrUKgIHs
z<7{RWt+DBOHmeL+mN9RBYL+dqlklr-l7-xf+$03_J{ZzlI%!U<FBpD7JP^=DsmAML
ztO2QR;!&u%TYl|pP65~9qMq%anI4^(o*GXcXBbjAfh9&KbA{xSv}<N|Z0y)m=)wzS
z9)WEWOQJ=%^!a^{&B@RljCuRRe@Ku2Pg%Ptb^U-e^oQY+_q+HbH+8Mk*DW<|c2#<`
z;D{93^r~i!2p{7du7nz3$nd~b-<ilmm^6xYmMJ^R8k{uR_&K;}3>K3P#poTP>-zg&
zNA9oSvEN(#a0O2jFUOy$;A<-Q7IhJ%G!;YY9)~a5g$*RiiH^B8gw>`g#nVA6<KJ<`
z?^N-ZZWI4gRs4R&QfkBIZ8jv-#gLmi=u`12#oGshN%M`ncPkIgk$!VeE4<IeKLM$l
z7_`^;QiCqfVTB)c@sBH<hu_T@pNB{wR(#$S^RmLPxcIXQzvbe~wcc~_uPXeBi(gUr
znxl*M>q2e5s~l@e)1YWJ%L;EOT^`GG3jgNf-&gn_7yqHcCM8C3^5B=K+;M%CgRyeQ
zyIg#^<9l8Fi%wqF<Ko{`{Gf~flK5JD4!Rs4!=YfCu}p51dAclV_<d##d=UH|UJFgo
zyYe&eaLo8BV8`H}Lvy%?&p<BRWgMmV8f6Gp!j0Rv(4zbuL{-Q~0&axUhOT~17oa)P
zWxTD>5y&CBOd~?M4l9T_U6PG9B3<Ge3EQJ-u_f^nu?-5*1evcRb2<PwqG@ADccQ<=
mgEd00RVOY7;INf8zECHYuwpgxO}Jvkj0AleQ1-xv)%YJE`y&7V

diff --git a/so_long b/so_long
index 93b7454893f95ebf436fbdddeeb0366668b52512..9d14b38e42d35cf3073fcee3e714e821c2a249b1 100755
GIT binary patch
delta 6958
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
VE9`uvvD!KRejVN^@sU-9{{zpV_?Q3y

delta 5159
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
DkZDsc

diff --git a/so_long.h b/so_long.h
index 72f9bf9..dfe9bc6 100644
--- a/so_long.h
+++ b/so_long.h
@@ -6,7 +6,7 @@
 /*   By: adjoly <adjoly@student.42.fr>              +#+  +:+       +#+        */
 /*                                                +#+#+#+#+#+   +#+           */
 /*   Created: 2024/01/06 16:19:42 by adjoly            #+#    #+#             */
-/*   Updated: 2024/01/09 16:17:27 by adjoly           ###   ########.fr       */
+/*   Updated: 2024/01/10 14:50:43 by adjoly           ###   ########.fr       */
 /*                                                                            */
 /* ************************************************************************** */
 
@@ -16,6 +16,7 @@
 # include "MacroLibX/includes/mlx.h"
 # include "libft/libft.h"
 # include "get_next_line/get_next_line.h"
+# include <stddef.h>
 # include <unistd.h>
 # include <fcntl.h>
 # include <stdlib.h>
@@ -27,7 +28,9 @@ typedef struct s_window
 	void	*mlx;
 	void	*win;
 	void	*img;
-}			t_window;
+	int		*player_x;
+	int		*player_y;
+}					t_window;
 
 int		ft_move_character(int key, void *param);
 int		key_close(int key, void *param);
@@ -35,6 +38,7 @@ int		key_close(int key, void *param);
 int		ft_countline_fd(int fd);
 char	**ft_read_map(char	*file_name);
 
-int		ft_printmap(char **map, void *param);
+void	ft_printmap(char **map, t_window *win);
+void	ft_putimg(int x, int y, t_window *win, char *file_path);
 
 #endif
\ No newline at end of file