From f33d52e6433fd73e0c5831f2703dc14bd651c74f Mon Sep 17 00:00:00 2001 From: Adam Joly Date: Mon, 8 Jan 2024 13:33:55 +0100 Subject: [PATCH] started get map --- Makefile | 9 ++++++--- assets/character.png | Bin 0 -> 613 bytes assets/ground.png | Bin 0 -> 615 bytes assets/wall.png | Bin 0 -> 615 bytes ft_move_character.c | 5 ++--- get_map.c | 37 +++++++++++++++++++++++++++++++++++++ main.c | 3 ++- main.o | Bin 2136 -> 5488 bytes so_long.h | 5 ++++- 9 files changed, 51 insertions(+), 8 deletions(-) create mode 100644 assets/character.png create mode 100644 assets/ground.png create mode 100644 assets/wall.png create mode 100644 get_map.c diff --git a/Makefile b/Makefile index 6d7fe2c..e408d45 100644 --- a/Makefile +++ b/Makefile @@ -6,7 +6,7 @@ # By: adjoly +#+ +:+ +#+ # # +#+#+#+#+#+ +#+ # # Created: 2023/11/01 11:03:22 by adjoly #+# #+# # -# Updated: 2024/01/07 19:32:37 by adjoly ### ########.fr # +# Updated: 2024/01/08 13:33:38 by adjoly ### ########.fr # # # # **************************************************************************** # @@ -14,8 +14,9 @@ NAME = so_long CC = cc -SRCS = main.c \ - ft_move_character.c +SRCS = #main.c \ + #ft_move_character.c \ + get_map.c OBJS = $(SRCS:.c=.o) @@ -38,9 +39,11 @@ $(NAME): $(OBJS) all: $(NAME) clean: + make -C libft clean rm -f $(OBJS) fclean: clean + make -C libft fclean rm -f $(NAME) re: fclean all diff --git a/assets/character.png b/assets/character.png new file mode 100644 index 0000000000000000000000000000000000000000..3d3a1bc8ec1e90b22f399b9354c27bf20deb9eac GIT binary patch literal 613 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1SD0tpLH@YFt%hmI|q0=J1Z0v<)>xlq%tsQ zOst(~>v1?hq}4xo>CzCHHwup?EVPOg5G}l-C9=?Ig=kc%LFG$%lT44G7#Y^=SdoGo>}=wVq?Usq@~@FH?MRo?|8gwS@6CI zpCg{`IU2e8TIBC}e_Ag#?b~#wH0rQNqM-K#1t&*Y(U3%C$K8HitvqwpYyUW}i&vWN zw2n){QY@gE?dI3!{|DdSj5>OfQ(toyOI5tg^JEr|w@ho>9@ofQ`@Lr2uwxFdIv$_R zWITU~xmDC3ju-dY^wwF=+Qc67j-lDVE$7raktM1k-3NY4)&|Q->|j;OzIW%=bBkJr zO(v_q@D>zs^i0#JzWe;{!*@IX-o8BVKL2HdqVx)-L^fcwa29w(7BevDDT6R$#Zvn+ zpdfpRr>`sf3q}qe4(-JmJ8XbLk|nMYCC>S|xv6<249-QVi6yBi3gww484B*6z5(Hl zeBwYw{+=$5AsP4Ho_7>vU|?Y|cp?y$qG@v{mv`D_+4-S1>I$TQf_%m=%#0r4(I1xp Pjb`w4^>bP0l+XkK(U9we literal 0 HcmV?d00001 diff --git a/assets/ground.png b/assets/ground.png new file mode 100644 index 0000000000000000000000000000000000000000..ff63997a2a87982b70deb8126ffa208ec1faa95c GIT binary patch literal 615 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1SD0tpLH@YFt%hmI|q0=J1Z0v<)>xlq%tsQ zOst(~>v1?hq}4xo>CzCHHwup?EVPOg5G}l-C9=?Ig=kc%LFG$%lT44G7#Y^=SdoGo>}=wVq?Usq@~@FH?MRo?|8gwS@6CI zpCg{`IU2e8TIBC}e_Ag#?b~#wH0rQNqM-K#1t&*Y(U3%C$K8HitvqwpYyUW}i&vWN zw2n){QY@gE?dI3!{|DdSj5>OfQ(toyOI5tg^JEr|w@ho>9@ofQ`@Lr2uwxFdIv$_R zWITU~xmDC3ju-dY^wwF=+Qc67j-lDVE$7raktM1k-3NY4)&|Q->|j;OzIW%=bBkJr zO(v_q@D>zs^i0#JzWe;{!*@IX-o8BVKL2HdqVx)-L^fcwa29w(7BevDDT6R$#Zvn+ zpdfpRr>`sf3q}qecCFy=Q-G1gAX(xXQR1ARo12xlq%tsQ zOst(~>v1?hq}4xo>CzCHHwup?EVPOg5G}l-C9=?Ig=kc%LFG$%lT44G7#Y^=SdoGo>}=wVq?Usq@~@FH?MRo?|8gwS@6CI zpCg{`IU2e8TIBC}e_Ag#?b~#wH0rQNqM-K#1t&*Y(U3%C$K8HitvqwpYyUW}i&vWN zw2n){QY@gE?dI3!{|DdSj5>OfQ(toyOI5tg^JEr|w@ho>9@ofQ`@Lr2uwxFdIv$_R zWITU~xmDC3ju-dY^wwF=+Qc67j-lDVE$7raktM1k-3NY4)&|Q->|j;OzIW%=bBkJr zO(v_q@D>zs^i0#JzWe;{!*@IX-o8BVKL2HdqVx)-L^fcwa29w(7BevDDT6R$#Zvn+ zpdfpRr>`sf3q}qe4zb@1Uvz;&k|nMYCC>S|xv6<249-QVi6yBi3gww484B*6z5(Hl zeBwYwfu1goAsP4Ho;T!WFyLS?n8CN^A?L~9gN~Q1GW^10zCE&FBn33q%A2$>cAnX4 RD-SfB!PC{xWt~$(698f`=%oMv literal 0 HcmV?d00001 diff --git a/ft_move_character.c b/ft_move_character.c index 3073b73..3cc42cc 100644 --- a/ft_move_character.c +++ b/ft_move_character.c @@ -6,7 +6,7 @@ /* By: adjoly +#+ +:+ +#+ */ /* +#+#+#+#+#+ +#+ */ /* Created: 2024/01/07 19:13:01 by adjoly #+# #+# */ -/* Updated: 2024/01/07 22:37:53 by adjoly ### ########.fr */ +/* Updated: 2024/01/08 13:24:49 by adjoly ### ########.fr */ /* */ /* ************************************************************************** */ @@ -29,7 +29,7 @@ int ft_move_left(void *param) int ft_move_right(void *param) { - + } int ft_move_character(int key, void *param) @@ -42,6 +42,5 @@ int ft_move_character(int key, void *param) ft_move_right(param); else if (key == 7) ft_move_left(param); - ft_putnbr_fd(key, 1); return (0); } diff --git a/get_map.c b/get_map.c new file mode 100644 index 0000000..21d91d3 --- /dev/null +++ b/get_map.c @@ -0,0 +1,37 @@ +/* ************************************************************************** */ +/* */ +/* ::: :::::::: */ +/* get_map.c :+: :+: :+: */ +/* +:+ +:+ +:+ */ +/* By: adjoly +#+ +:+ +#+ */ +/* +#+#+#+#+#+ +#+ */ +/* Created: 2024/01/08 13:13:18 by adjoly #+# #+# */ +/* Updated: 2024/01/08 13:22:56 by adjoly ### ########.fr */ +/* */ +/* ************************************************************************** */ + +#include "so_long.h" + +int ft_countline_fd(int fd) +{ + size_t line_count; + ssize_t rd; + + + while () + { + + } + + return (line_count); +} + +char **ft_read_map(char *file_name) +{ + char **map_read; + int fd; + + map_read = ft_countline_fd(fd); + + return +} diff --git a/main.c b/main.c index 222ddc5..9e0bbfd 100644 --- a/main.c +++ b/main.c @@ -6,7 +6,7 @@ /* By: adjoly +#+ +:+ +#+ */ /* +#+#+#+#+#+ +#+ */ /* Created: 2024/01/06 16:18:56 by adjoly #+# #+# */ -/* Updated: 2024/01/07 19:12:34 by adjoly ### ########.fr */ +/* Updated: 2024/01/08 13:09:20 by adjoly ### ########.fr */ /* */ /* ************************************************************************** */ @@ -54,5 +54,6 @@ int main(int ac, char **av) mlx_loop(win->mlx); mlx_destroy_window(win->mlx, win->win); mlx_destroy_display(win->mlx); + free(win); return (0); } diff --git a/main.o b/main.o index 7f1c98831e980c56bdbfe95fdc8ba27cc051f4e5..aab4d96b1a502f50303fd6262ec1f82ad11b3944 100644 GIT binary patch literal 5488 zcmbtYZ)_Y#6@Po@J)eE{`Rt4TCM0fEl2DX&+ys%fZsMppdUhO#0!~sOoY!}I_9c6} zr~BhSs1{YzQY=ff`9?pq}jO zSX;f5UaM_hTfOs{u4mhjkX~Qi+#urUt@O2DCoaE}?>cY>cHzTa@zZOopQP7QpQP7P zo2cUf6VP2C}kdcnuInZWi9szZ=( zEw%9mH-ClMH_~fSq1I2_7>@wF{Y)62_$|snB7-C|&D0>GB+RLG7=2%lpv2<2P}ON~ zo0##gn9UQ;Y@~09k<|wmbj8(DyHzpSUfmE4@g|2azfwz0kqtQjgzq$VrCaiBmp9QsKW7p*P1lKaSn=h zB6lK5o)gG#!*FP~u&bWP_&^YGXmBEVY7ii1LP$cCv*UP!3G4UV5uuMtJu4RH^Ndsy6C#N7;1wzimAq((duffj+&B zqK3agV7;&7I4T)+xFL$IAnNcc@-WAO$aufVAu4XRm`|h2d=75{h~Qc=SM#d1;jC+W z^TUfyxl-`G;n4@Iqt@t=(Fbe7dkl(p!Lzb3;^iwN3x3h5jM%v=zPmDV#?RJ@j#sUW z-~@DiZysu1r7-U~x#5CWg>zGvGG|jyoH>7Sn%gs96s>dTXTF@OhYl|k$~c#lzy5Eb$@uoAVOKZ*R$v_4C6oXPEtg}%dkey z+1au`RhYXpQt+~FE$39g0;;IBKn(f*&{1F9z zbka-!fReF#jNeF*Fge683FMR35OD3+LOvr|8g zz83gsYo~{nvwBe*++n#mHh^e^fwr8T5)PKL9gZ+`?!Z2W<4Np50Um3Dzlhx3`1H&@ z%J{`xM(%I$BK#I=5-~?ne;%)0^EAPGo8Zqj!GF{Qf2hfGz1M_)xC!nz!R;n^OxEWp z`boGx|H3xaXO=(|@r|S2FRWlqrX$@QJT{R`H^HwfIMs^zKTvSmRvG`Bg3~(0_=gJK zrQn@7eiBk*dleQypTueJz@5FG=aj;4mt0b5g->fH_ghf-eF~q}FA~bH@@Z`)Aw|bn zmKU4wf2i>LnT-0U3cm+!9?wk$r+Lcw?-e|*;D1$c`pTHUq2P4zU>r|iLZ~)k-<38W zeF#^-ZWY_X?$@)Kd{=0_%TiPFKIOqSb#5w=0v}yez;W~UE zEPz1`=RAiroa=K;;-qN)+>&`tYy5vo{Je&X4;FowH9Rcss~XPzE@}AtGXHlp9FMO; zhNYjzsLu0o4d?pLYB<|ZY4|N^e^qMgPR-xm-PhmS5$#IuY3oVEJ6q{6mBDjWwd}8C za)nCCwO1N2d1xh?=PdEjmCUT`*kuN+oHJLO&)9QwWoHqrvg6uT)mg5JT&2RY<7P^= z!1BFJaE`UIevuC1f>ZDcRghV5G?1@mivFULp<}L{tvY4Fa(%xfvj-g(yu2Trl4(ff z&Mf%;Rj@q2>R69W&m5^#?JU}^yI9QFxg7plm=|YldBWa4gl`|fgW(4qxCPIVJvs}S zJf6ZG$d?^Fnsa}Sm!r{UZP)d)d zIMti9DWdRv46I-u;x_58;YD*pU6TnPryC0Wm{o=L7*#Hyq3#Rp+mxH#2Qr@GX#UY2 zPBIWESU^8f9*{Px<8rdnI-m*mlRZKWq9;wOjm>+>{S-pwt}4`cE=m zqruDSrmi?Sj-k&YfPW=fE{5UzGX8sYBxvySGkg$(cdOq~Ie%v*k?Kb!<#?VyLqY$N zwXIIb2~GcNP(?GLw@Lpm$o{z>>YvU_djA`Ug{QV?TYn0#y1XjmDUO7--v2BDdhLk+ RhWPIfeuvUYaRll8{|^W_)KLHc literal 2136 zcmbu9O=uHA6vtoEntt0L3WB1!`2k(B^&o;s{7BtHsUj3SShm~jrpE3^Nj6O)gbGz5 z6hTjlw_e0!^=3s8TJYkjcqn)&sNlgvdn*#C@6FDn>zD<>2fJ_HZ~kvS-p=fNc61~j zi-E8hT!6huP=IIq_SzZN%s?M1$F;_HZQ*CKQEzIE^43DVd1~-M4+^x!`qmE;svoq4 zwdBNVe(?AeXrqUJ(WgIVn>1LXzC+V20~=avWH)f0jrW-Zz{>p&ob?T<$b?{%1lnSG zb96Dgp{~nC~K6EEPOA zr4B1;MIBPlm09l@fP-w20I|C_AXZJrj`VkRKgPlzMNSXdX?k7UpL`gptBs+w0JAN~Q8xedtf}f1wmm>I6H==wEYA^$UN6x11B}$4BVbIVb%9ZY!xHOz@xh5M@$$^5a_l+s^ zHHZ14XBxgiSXESBf&X)Bm>xbyVzgKEq0znuuJxvK5jOhA5TkDywhRvvQi6O}&!Ub` z6;6i?UsQ_c)19GnL3e@daNyuGdXfzDSh$f;o?zs~a)iIenK)NMdz}kT2*AC_6W-(b zk_;+BAa%%?{%^=;!)KmSs$5u=^2PoIUcyGZ`b~1EaUs=@?xDyR^_xf5F}h3JxQ9>6 eUh;gp(`1xSCa?b!GI{N!+u}k|M+#|3dH&yrrZxcp diff --git a/so_long.h b/so_long.h index b43a93c..60fa634 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/07 19:24:27 by adjoly ### ########.fr */ +/* Updated: 2024/01/08 13:32:18 by adjoly ### ########.fr */ /* */ /* ************************************************************************** */ @@ -15,6 +15,9 @@ # include "MacroLibX/includes/mlx.h" # include "libft/libft.h" +# include +# include +# include typedef struct s_window {