From 904013801a2c842424967214fdafbb1c13727db0 Mon Sep 17 00:00:00 2001 From: Adam Joly 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 +#+ +:+ +#+ # # +#+#+#+#+#+ +#+ # # 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 +#+ +:+ +#+ */ /* +#+#+#+#+#+ +#+ */ /* 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 zcmb_fO>7%g5PrMsbsRgfouq2g-#8Q+DC#;cMe0vfg4%*(DnOM|RRU@pXYIK4AND#; zP@|+uTNENtLEQN31rCS<6$ju@@eda`a6&>tDiV=e2|;?RM5QvbJF{88CTdkW(%YH& z=I70OJAQ9HbMVj;s-g%cMeGyH8lyr?hL`0bTO1M{;5m|`Vj`RI+FY?X(16k~1 zp~QPo-`tOPn{R&lMsmKfG&g-?edH|eb#h^P$=;)@hd~2;t&BhF;654eaqyPN+192! zpopvPBk`59`I&m%wCeF{F*9Y>jA}VAln&*AaF?!yqum?A9ZIKP2sI*xyM)lz0@K2K zLVH6(__`D=911y#-Y&H8a2G1Oz~+y@JT3PFwl5R{Jzzl6PXADk6WqVOv&| zlLvP;sUbOJxC?{CE6|-jT!jeOecEQr^5bi;sc}HHJ!De)?5GEo^*SOmFqDmAS>6;_ zmN!Rjc@}+odzR%`O!(EafVRL8x-WnX=>QDn2ufFju>mdRSsWLXg}=j!qCO3AFp zGh@dq#i{s#O14ol%g~ASO1fBqHY^n<#mPch6iRvFbZ2@}6v`GWQ=*;*`&i|quvp-^ z8dY~%u$Nt>XyzgKWyj&gSwj175}0x0$cvK^9Doj8`QU^^jJzCFm981b?0Dk(XKh{&+8i09Pz)e zhk!>Vy+hK;t|gD^s$bjvry77Q5534e}of}I`)Z+LtL-y|0>1G{=X0|`~S9ze;+ym$^P32m-8R<;CQTZof94$ z-wxxid+?wK|ImZuHO~HU8QX-uI5!htgNWM~78yE;GrpDdwH};vBDCIvV;XUBa=CkIxqkkACnW#RDF0pw=lsJG&iO|ON2bEyb0{nMe^2>elJMUNpOJ8$H%4~M zje}{31jhNjyeQ!pNS~E(-UqgG9F=mc7^6AXzXw94uM$If{ z49lFfgpsY3@H5E0Ynwk(?C%!}u3I(N%e|3Z1ipZrw9ZV0a<1aq>`x-2T(L~!$)`uQ z*R4$U1RARi3qQ7uVsWCB&Ww%02OVg3aZZ+Ep==Uhj;C|*nPj?2-4fuVz<}DU%qZ}w zlFe(Cv5b{LIAQP!&pUE={4#`j?+4D(pev61pK)prR_*UK#Jp!88i()!gnuBs6!j_~ z;~yOF`OD_>boIt49^cDe3JivQe29D&!*@Ffsd+P}+m zk=uVE!3Xybzau!F`{yEHa!mla4Shs1N~-u6TvwX^DE)qT9-JQ`d4B9K?a<8%uvr)` gRVkjg5#y2M`L6&b?;ZLbwf|ZRv5NwbAtcZL9}E*tPXGV_ 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 +#+ +:+ +#+ # # +#+#+#+#+#+ +#+ # # 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 zcmcIoZD?Cn7(Tb{+N|Ant4^#DPDT#z>Fn{>Td(KV>3e_u{=VMbiZR+LglHGSXj#3w9udO1B8Q`q zqoLSjJSxUhp=30CC=^X56G<@K&s(Z0lI<2W2-Xx`;V!=YFwsnTnlDmkQQ0JO!(W#?D(6J2JFv&TsJbEoA=?r>*Pe z?A>*qHea^dX}-Nct~1v43x;`e9r??f=qGP2XBUi|wOszZR;#Thb3#tWy%hG&4ElsQ zyWKOynaw_OmS`Tu)0=&6&b(EW$&2N0o#c{nrOhX2ogZ3$VyI|Gz6Wr{su|@rN=Y4I z&ReyS%i{ra>ntHcjL*sSXK(nq268I-r%Le3egQpnOXj@DR%w14)xDjws^vT6O{U}o z6s)RZSMBU~{*lXW{#<4yn^_U&8;E{Avr=mn!aOHasi5-jNR=IY7#W0l@*euVghx3~ zueNaV=h~!q9pAGw%+K;anPTZflCe7rl%k2T5fCk_m5+G1P_s-BChb&hH{ zKj(G6_Kx*kEh3PN#=?OV9g`vuNlZ;ehA^f=G4nFqXvW& zLMq;8wkRUbZD9Hu7S*`SS9CX??>A5fL-aDBT8@8I!_{=$I#}dq%uBtgt($#1_q-E- zOs7{BaDoF>tFPxA;ok3x>D}sq*a|@Xuzzqo*Ke4x)_t`EH8XU%_M(bM3=Huwef~HW z^|^z0Og#|43P6K>L?6FS6q2O8rAF-C^{+MJX$-6^DBB>d$JK~cI<6~#Neor#9IrTX z%~3$46-kkiB&w9J(RL5%G;-P8Is?AaSV31~6|5!Tly6bC*|o~#2K@Onb#j zbCb_pwT*(EEf{jsXNFWFy1@B}!pkxR)NFoe$(b|WR;lg?aU^CDPLh~}E~%9)l?${I zjwV4hwCF^W{6Mrsnnx33QDs^ze}TntEk371Cxn zHb`|r%-uy@sS&vd)$$iSIrE}b`HF_E*#lS2Q+2ZMEyaPHJqtxZqgUij9qowpkd!np z^2~EIa}s=dnS;dSLM_qK5HeK3z*$H9)h&3nz(2~ekaM*Hy(5?ZOAR-ZX+VN$-(CClPZF;0^WZ*27c|!~-b7T3 zJsfzDT9}+WwfpIknhqeDTr;)!8>>h0wiNRDDQ+ARW0LOr}nnij)sEeHq?m|iog6DiH|Ay zAA@@Nq5iP{A4Eu=)~%o4D8&sFlm^!i;7D3h14_E!&L980ejYX$h zfpZF7Pc5E}Pu=qw+Dt=y3NjgXWv}u4x$P$>_r1KIRJ<2MU+3a)9m4cwiX|0)D-Cgw y;v231eFfSWlnm=fjrH|ELs%mXQBv`o8}TrG{?I^;mbzcP6blF +#+ +:+ +#+ */ /* +#+#+#+#+#+ +#+ */ /* 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`CYD4eOKPYMH>uZPrl(yLZ!#@h52dtFny*5Reze66mZM6Ym59>R? z=SE%cbzWeTpdBad=snKv8R1Wb`3H%9J?Mr(7u0Vl`|F_F&jP5MOo}IU{wAq#`Uok2 zy8bfW@6k~3YTrKx?FJ!Q*UV}w5iFdlQkB78(@O3qI`K4l$CMi)v@9H7Pf`zpo^?aw+{}E zf0Oy}z)5r!os zmW52>%T89}3!F~sMTyV$hS(2yjSG@AzB>Sa1#zZBdqZPA!0{+v&(o +#+ +:+ +#+ */ /* +#+#+#+#+#+ +#+ */ /* 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?gakUATRm{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@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|mgo3r&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 +#+ +:+ +#+ */ /* +#+#+#+#+#+ +#+ */ /* 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?sN0hsELJWhF5SvrPqalfaE#^eveE}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!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;`eaUkOVIZkOG=!`(&BJ422Wqv5c@LIOl$AbtcZTOfp3$t6-~wD2Pu ziC*OLFEp{Sq_B|CU|}MKg%wiTNo+7N5fciHMtn1S2j@T8eeeI~H*Y?6m-}8hpi4;yPMt95R1J`WgW{s3=`^98?~GiDo&+l*wiTrGAuYDOo*|A>~0iLi%eGfUA* zWz3nilSk4j56vi}q9V-0>>%$J2YJCmDY1)QYY11Z+0L@+HtKp0jkAtzmUt#9*ci5~ z8SZ1u?&mHR?3sjXi(!1X=fnWv3HDOC2;Ffkxl>L$+bO(UDldJv!@*zo*6QPq z0vE)crnV+saZVm`^+a|BAG~4uf22PsKP!av920&q8Yfom;*_o(yx!xkKg>6U=&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 +#+ +:+ +#+ */ /* +#+#+#+#+#+ +#+ */ /* 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 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 zcmc&%U5p!76}~g$JNB-#_Wq=8nwG8$VUr3n&Te@~n80Js%_%S|lPfgdqjZvX`X z%@osD=OK}q8pztiSzEvY`%eg^?W=z{YY_=O6^XkG~^XmM%RB@E$LJBggu|S_4 zZO?BdU!A{uvYpvHnS3?F!(`?VLo6XsG zNb>RzV6re26o;H_s2zC+bZ2cg1`G!o(n#`VB-Y%VPF~pu#bB`0x((O$*4t(q*7-NA z2e`1T8xsQ)9J;>*zYmJ^^cHk*;{FnRcVL3d{Uta)Fu~d6mC0c6zpepL$VTr4m(6Ux zu9&S%XX9HRZExcWa$tR90ReVb?Rwqu>*))2xolM3BH@0q<~7`W81a@~2)oWo$q)P0 zvc2lm7@~|RpH56rEiwAgBZ)C(Tqi^|036rn_GpQx<45BAA3pXlAsQtr2To5A68T(@ zOZO2iaWo!}6QU;x5~2@+3K9?!n^3ewJdW8285#lZ=?QcWgFDO~+B|FweBgi!79qRv za*y0mp*w;80}SQM=qclx`trrV`U@!VR(iZ@;Nhyn*mB^V#FFaEdFJiLIPeyk_W*j` zN_T+CD^2a>o;nLCctP$d%nk8D?gI-!?nO+aJb@meXw!)PKB(xw&;d~&kD)rC?j1sX z6o~4hq-%d7*0moSW%e=TOz!F0sT3L3v0?o*46!o0qT}qMi*P~F36%y$i$_ zMxj)8vQ^t(Cb?z1hGD?R>ng#tSTWUb>!qUWifV5#%2)*!9B4vuDzuoVGFPb!7ZRD%6}3g zsE`If#USZMy_PPQmeS?&`O3lR8D_H^kq&M^y5#1{jl4s8)*s^eG8@a7sqW|VP62Ec zM#vDmqNR;1G&UT2zCrZ{ozTBc^;uBMRMTTAI%a`>hK}hLV9k55q<)#Ix~2bwe(F7X z07wUC>4-(u4{6+@dm(TVuzj=i35yyQebS!du+C9M|0*T1X&M>+Cmm|i z5n!tprTPsz+@uNchAq~DMPvF;=`H|b7EQA2I9z9GQZLeRy+9u*P-;PZ?DMQw=wUaw z7JUe=|96&l>aMOGfo?U;e~m`8#5t;J-fL9RCeEok+-$rJ{p7CzM#$f{`;BSc*G$i_ z#$Sg$AUIm^gv&7C>`l@KAGrtnGa#e)poE+PY#jUHGhurius;mo*99Lm3VUWizX88~ z`F}A0$8!DnbAY4Zhan2Tt?fVx2!hCXJAfGuUzQ#I4?{Sd}f2z(=ieX^A96YWF^*#x_A`xS5OV;3P2wL9 z=%h7(4`%@;I47(vM0}hPXCD?mFwV8Wr?~%M2p2gK+8e?#&kXk;;~MA1TVu#)2H;O| zT-0TU0>Dm4c$xcOl<*q&vl0%U6ebl3|2g-+A>qH~eoMl|A^7_o-UTZh~xj3_}}Bc%I6{Y?C=F+2?-Z{ z?v?P1JkOMbuW@`v!o~Vp5`Kg8zb4^-^1`rFsdyqSa7ZChg5f<^D7TA6;!tXzUZw>|48ZU@(m`Z$! z_i!RUA4r+uzEDGaQeP4P*F2s03={bKwPS~=&+~ZvPa75yFR-tGA!9i9E{|W91|^p~ z2i$)1U%`(oNQbW<&L7uUp8pZRFy|roh2rZ?@w4noX|NK z6n2>Rth^!kpv?VQ5MPzH2|3H-&xMnME#@!aAA`|v{TBKD73+fQhf6Br#s0YlnA{UU zGNlrhOVI?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%!UK3P#poTP>-zg& zNA9oSvEN(#a0O2jFUOy$;A<-Q7IhJ%G!;YY9)~a5g$*RiiH^B8gw>`g#nVA6q2e5s~l@e)1YWJ%L;EOT^`GG3jgNf-&gn_7yqHcCM8C3^5B=K+;M%CgRyeQ zyIg#^<9l8Fi%wqF5y&CBOd~?M4l9T_U6PG9B37&y@cv>-=e5^2a2v$1t5ROeY%nko0!I=(x@3(3J1!{_Gw8 z4|2$KHKRuw_*J$6*T4lcPqyvueS82A5L3-FK8MXe^VD6A_QJ51wqlVN3&g zOxQnq@oF8T<%eqDLKmS6S!V`>@rV>HIm-zD*9y|+k} z{B3WM^mqJY?>APjhz1811_wxVJ61zh{WAE|o-7UKaOnFo9uE%ejsypGM56~W?z-i| zXpK-5bN*}M`ja4xb{o(a^Ja#t__$&+m8{+5dyxmoQ!{GtUYb;w= zB)R%%--$q1$N>PG#;nA0nKJ&aqB>rfSr%Rqbsf`^dMCSGeXC)8oQ?y1eb2#35$u0e z3|fCMAmsNNFzvyB#Y&xGm2Ftz{eo!kj_RSlgG1;zodY_Y3#iYFV-PY>}mS@VdgG?{At{j7QEV3wQAf5l|1 z4$06<1zj&P$1 z^a!+K2!j28h}H@cyS}$ZD41){VHk@J2Ihg{Tk_`MGEOPJCJ7~=bVej?RfcJkR_0#kadvxAHpB< z1;{;+54><50npeLLjY1ho`uZ6fB;x`8NWQ5c@Uuu!Okb(n0CJ)Sv; z62NeMm3}q!p|8<*Lf`W>`h5~x&yK+0QELM7E|CEx@B$@(`T2B;{$fHu3O&O-y-70h zx~CGaI}ZNHhkWylTs0LlbmBw47tJ|ny3g|=G*=UQp1*}=Cz@mD`2{rhp~<4$IWt#% z0nJF1&qi|;%|MLTqdAUd=mOu1CLK+!9}N%9>`La5TbsRO0S$2&%Mmr= zH1PWJBB_CIF8{t18opYdB*_gL{}(xvXIH*2?c-M~OQnC}fvT$T0wkVfR{~y5_|8Tx zH9d`5cGFr{<^8)xtf>2#Kr^9ZN@$AL^Q7^cUZ<=`_wwsrJ%$%89X?jIIE`p|ZV837 zYurD#I6R4_tvKalh%#Gl>Te;*$d=Die{Hr49I5Yt6MUgN^TAHrUzO5NdNa==f=}>$BnZYr^VH z91XGw=-iT;PQy&{+7SGjg#IP(8PI?`W!NT=7&*yHwp1>|WFqPNZ=&A*SeatzJYs z>2p-HoaADMSWa?oGA*ZC7|Qu9nPytF3mnO`nnb(MolL9gcCsnTPNvl)+JOLbs+4h| zN(YQGhNdd1^nOXSxoB6|%9XjpSLS_FN-1Hs^xBk^6bvulZ>n8K^(XJul?OQq>P#g^{&=cRijuZk4NyVW+;+dkD>xzU;GViZ0p3qtP=3HT&i zdP)j)jRlg1#8&wTECh7A@D}Vo{-f##B{z32sE}NI@q!0)T&iQKlA+csIWdsr zBG)VFsv~3g(1J8c8sq=G@Pn|}^^CTxBuQVSr;)%QFg#K@W81d0bZ+U|Sl&TI`}US^ zZ~3bYE$chhZC$s1J1#@(sb|a{)~vZNZ7xa4aQ;kD(Q%r3m*Ry?tyc=ll^OL)e!X%_ zxl&m}nMmq6g@qk6{}0xG+BmOVDXvjw)hmH|rLsH``p+`H&rAf?PUkt1b-KDyu_0@h z`jnCa>7Ir?)3Bkp1)CLFwJka;J1~gX_<=>iaQD_tT^O`=-TFvP8O?3m+uAm?V`Q=Y zXw#d!)#jBHhtu(`9g4a`@u}Zc)EbBmq~r)Fo_ff;6c5t!sl9*1xzs(#p&p6PJg1bY zylioGvZG3|JFh6oy}WDjZwpqQRc%WgHHyu)eMGU_(vh=m%ZMV`e9f}TA6ydg==a=~ zoy=%F%$L>lHUFu(H@O|%iKWrD<)N+w=-kl0Jps0E+SqXeC6*BXdCfiigls>c+Ijxc zALJM}by|W{{sNE0GFh~NzqPaimzJwbo1|ax;#$A-pQ1i5>MK;Qli_7&pTvcyrAqq> zKIbd=o54%C)ti4d&_$HW68?E@MNXs8`q<<1G{Gh+$|2kWEn{A0{w8T^w+gQ;X8w|C z@_#M(Y&}5X7t=+yf^)VLS;XAT6ohJ*iQtX%Z^T)?H`JmFN!`--;tg3reQZd!(Wrd{PSk7 z#(nHjy;JtN!JD5cx~EaGV;y_($B(bTPc5uM>vfSVO27xmLb=Vb&EUm#FMG_>FL9I& z|Eg|KN;7G3-tqM-L+ZBeTRU4e@)uV=n`$cQWaN!^_AHwEJxv^zI8nddxwEBh1AMnU z-15+-E*z{0EgiDM7w;UBhJUc?S(|(apZkV#r@5lX0(@)3g5*k#lE-%CFEuQ18>p>P zC*R?pH&l4FDosGGN@rKw_~JDc?gpJT|C`3ai7(^rgMDg*}q0(f7 zcv<0(gsPn{u4JNA$$SJb64YUn%C7=euhpSl=8GGvGqpw?9x?tKr5Lb)_ch+)oM_fH VE9`uvvD!KRejVN^@sU-9{{zpV_?Q3y delta 5159 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 +#+ +:+ +#+ */ /* +#+#+#+#+#+ +#+ */ /* 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 # include # include # include @@ -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